detect if stdint.h is available. if not, use inttypes. this should fix #239 and make...

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

diff --git a/program/configure.ac b/program/configure.ac
index 49f1281d98bac506cc302f0c4755f4fdd7eb6015..65aa310ca36e16e9e44c862f3a67989550412da4 100644 (file)
--- a/program/configure.ac
+++ b/program/configure.ac
@@ -182,7 +182,7 @@ CONFIGURE_PART(Checking for Header Files)
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_DIRENT
-AC_CHECK_HEADERS(libgen.h features.h sys/stat.h sys/types.h fcntl.h locale.h fp_class.h malloc.h unistd.h ieeefp.h math.h sys/times.h sys/param.h sys/resource.h signal.h float.h stdio.h stdlib.h errno.h string.h ctype.h)
+AC_CHECK_HEADERS(stdint.h inttypes.h libgen.h features.h sys/stat.h sys/types.h fcntl.h locale.h fp_class.h malloc.h unistd.h ieeefp.h math.h sys/times.h sys/param.h sys/resource.h signal.h float.h stdio.h stdlib.h errno.h string.h ctype.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

diff --git a/program/src/rrd_client.h b/program/src/rrd_client.h
index 90b78f8df989eab0b76a509ef21dc116ccbeb25e..787c2b6d649dcec54f6e171b6eba40c5a9c1d251 100644 (file)
--- a/program/src/rrd_client.h
+++ b/program/src/rrd_client.h
@@ -22,8 +22,24 @@
 #ifndef __RRD_CLIENT_H
 #define __RRD_CLIENT_H 1
 
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
+#include "../win32/config.h"
+#else
+#ifdef HAVE_CONFIG_H
+#include "../rrd_config.h"
+#endif
+#endif
+
 #ifndef WIN32
-#include <stdint.h>
+# ifdef HAVE_STDINT_H
+#  include <stdint.h>
+# else
+#   ifdef HAVE_INTTYPES_H
+#      include <inttypes.h>
+#   else
+#      error "you should have stdint.h or inttypes.h to compile this"
+#   endif
+# endif
 #else
 #      include <stdlib.h>
        typedef signed char     int8_t;

diff --git a/program/src/rrd_daemon.c b/program/src/rrd_daemon.c
index b4bc1ee06ef0319ce83eb79797857ea88de4f0c7..16b5df59ebf769d8d4884d5a885feb339347558d 100644 (file)
--- a/program/src/rrd_daemon.c
+++ b/program/src/rrd_daemon.c
@@ -77,11 +77,13 @@
 #include <stdlib.h>
 
 #ifndef WIN32
-#include <stdint.h>
+#ifdef HAVE_STDINT_H
+#  include <stdint.h>
+#endif
 #include <unistd.h>
 #include <strings.h>
 #include <inttypes.h>
-#      include <sys/socket.h>
+#include <sys/socket.h>
 
 #else