Build fix for IBM support.

diff --git a/configure.ac.in b/configure.ac.in
index b94b9ac..a08ef7f 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -5,7 +5,7 @@ m4_define([conky_version_major], [1])
 m4_define([conky_version_minor], [8])
 m4_define([conky_version_micro], [1])
 m4_define([conky_version_tag], [pre]) dnl [] for releases
-m4_define([conky_version_revision],[_pre@REVISION@])
+m4_define([conky_version_revision],[_rc1])
 m4_define([conky_version],
     [conky_version_major().conky_version_minor().conky_version_micro()ifelse(
       conky_version_tag(), [pre],

diff --git a/src/ibm.c b/src/ibm.c
index 560d2b0..80aa3b8 100644 (file)
--- a/src/ibm.c
+++ b/src/ibm.c
@@ -130,7 +130,7 @@ int get_ibm_acpi_fan(struct text_object *obj, char *p, int p_max_size)
 temperatures:   41 43 31 46 33 -128 29 -128
  * Peter Tarjan (ptarjan@citromail.hu) */
 
-void get_ibm_acpi_temps(void)
+int get_ibm_acpi_temps(void)
 {
 
        FILE *fp;
@@ -159,6 +159,7 @@ void get_ibm_acpi_temps(void)
        }
 
        fclose(fp);
+       return 0;
 }
 
 /* get volume (0-14) on IBM/Lenovo laptops running the ibm acpi.

diff --git a/src/ibm.h b/src/ibm.h
index 64cec6a..dddbc6a 100644 (file)
--- a/src/ibm.h
+++ b/src/ibm.h
@@ -5,7 +5,7 @@
 
 #include <sys/types.h>
 
-void get_ibm_acpi_fan(struct text_object *, char *, int);
+int get_ibm_acpi_fan(struct text_object *, char *, int);
 int get_ibm_acpi_temps(void);
 void get_ibm_acpi_volume(struct text_object *, char *, int);
 void get_ibm_acpi_brightness(struct text_object *, char *, int);