more solaris 10 portability changes ....

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1954 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/src/rrd_client.c b/src/rrd_client.c
index b018ee0..034beca 100644 (file)
--- a/src/rrd_client.c
+++ b/src/rrd_client.c
@@ -26,6 +26,7 @@
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>

+#include <strings.h>

 #include <errno.h>
 #include <assert.h>
 #include <pthread.h>
 #include <errno.h>
 #include <assert.h>
 #include <pthread.h>


@@ -33,6 +34,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netdb.h>

+#include <limits.h>

 
 #ifndef ENODATA
 #define ENODATA ENOENT
 
 #ifndef ENODATA
 #define ENODATA ENOENT

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index d3de4cf..c11ac2f 100644 (file)
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -9,6 +9,11 @@
 #include <cairo-pdf.h>
 #include <cairo-svg.h>
 #include <cairo-ps.h>
 #include <cairo-pdf.h>
 #include <cairo-svg.h>
 #include <cairo-ps.h>

+
+/* without this will not compile on solaris */
+#ifndef __EXTENSIONS__
+#define __EXTENSIONS__
+#endif

 #include <pango/pangocairo.h>
 
 
 #include <pango/pangocairo.h>
 
 

diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index d75247d..d351cba 100644 (file)
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
@@ -275,21 +275,26 @@ static int get_xml_double(
     double *value)
 {
     
     double *value)
 {
     

-    char *text;
+    xmlChar *text;

     double temp;    
     if ((text = (char *)get_xml_text(reader))!= NULL){
     double temp;    
     if ((text = (char *)get_xml_text(reader))!= NULL){

-        if (strcasestr(text,"nan")){
+        char *c = text;
+        while (c){
+            *c=tolower((unsigned char)(*c));
+            c++;
+        }
+        if (xmlStrcasestr(text,(xmlChar *)"nan")){

             *value = DNAN;
             xmlFree(text);
             return 0;            
         }
             *value = DNAN;
             xmlFree(text);
             return 0;            
         }

-        else if (strcasestr(text,"-inf")){
+        else if (xmlStrcasestr(text,(xmlChar *)"-inf")){

             *value = -DINF;
             xmlFree(text);
             return 0;            
         }
             *value = -DINF;
             xmlFree(text);
             return 0;            
         }

-        else if (strcasestr(text,"+inf")
-                 || strcasestr(text,"inf")){
+        else if (xmlStrcasestr(text,(xmlChar *)"+inf")
+                 || xmlStrcasestr(text,(xmlChar *)"inf")){

             *value = DINF;
             xmlFree(text);
             return 0;            
             *value = DINF;
             xmlFree(text);
             return 0;