[patch] Patch to build lm_sensors optionally without iconv

lm_sensors-2.9.1-disable-iconv-r1.patch (text/plain), 1.13 KB, created by René Rhéaume (a.k.a. repzilon, rener) on 2005-08-28 08:48:58 UTC

diff -urp lm_sensors-2.9.1/prog/sensors/main.c lm_sensors-2.9.1-disable-iconv/prog/sensors/main.c
--- lm_sensors-2.9.1/prog/sensors/main.c	2005-03-27 09:44:53 -0600
+++ lm_sensors-2.9.1-disable-iconv/prog/sensors/main.c	2005-08-18 06:14:00 -0500
@@ -24,7 +24,9 @@
 #include <errno.h>
 #include <locale.h>
 #include <langinfo.h>
+#ifndef WITHOUT_ICONV
 #include <iconv.h>
+#endif
 
 #include "lib/sensors.h" 
 #include "lib/error.h"
@@ -116,11 +118,13 @@ void close_config_file(const char* confi
 
 static void set_degstr(void)
 {
+  const char *deg_default_text[2] = {" C", " F"};
+
+#ifndef WITHOUT_ICONV
   /* Size hardcoded for better performance.
      Don't forget to count the trailing \0! */
   size_t deg_latin1_size = 3;
   char *deg_latin1_text[2] = {"\260C", "\260F"};
-  const char *deg_default_text[2] = {" C", " F"};
   size_t nconv;
   size_t degstr_size = sizeof(degstr);
   char *degstr_ptr = degstr;
@@ -134,6 +138,7 @@ static void set_degstr(void)
     if (nconv != (size_t) -1)
       return;	   
   }
+#endif
 
   /* There was an error during the conversion, use the default text */
   strcpy(degstr, deg_default_text[fahrenheit]);