From 95df04d6dd28f811004faf0cd000e7f0e82beba7 Mon Sep 17 00:00:00 2001 From: oetiker Date: Tue, 25 Aug 2009 09:01:16 +0000 Subject: [PATCH] detect if stdint.h is available. if not, use inttypes. this should fix #239 and make compilation on solaris 9 work. git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1906 a5681a0c-68f1-0310-ab6d-d61299d08faa --- configure.ac | 2 +- src/rrd_client.h | 18 +++++++++++++++++- src/rrd_daemon.c | 6 ++++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 49f1281..65aa310 100644 --- a/configure.ac +++ b/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/src/rrd_client.h b/src/rrd_client.h index 90b78f8..787c2b6 100644 --- a/src/rrd_client.h +++ b/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 +# ifdef HAVE_STDINT_H +# include +# else +# ifdef HAVE_INTTYPES_H +# include +# else +# error "you should have stdint.h or inttypes.h to compile this" +# endif +# endif #else # include typedef signed char int8_t; diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c index b4bc1ee..16b5df5 100644 --- a/src/rrd_daemon.c +++ b/src/rrd_daemon.c @@ -77,11 +77,13 @@ #include #ifndef WIN32 -#include +#ifdef HAVE_STDINT_H +# include +#endif #include #include #include -# include +#include #else -- 2.11.0