more win32 fixes by guenter knauf

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@1743 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/configure.ac b/program/configure.ac
index 58fadc7ed75d1d13254462a540e9ad4756708f28..a9db815b31569bb907aa5e23b392474abf57fbc3 100644 (file)
--- a/program/configure.ac
+++ b/program/configure.ac
@@ -316,7 +316,7 @@ CONFIGURE_PART(Checking for Header Files)
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_DIRENT
-AC_CHECK_HEADERS( 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 float.h strings.h)
+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 float.h strings.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

diff --git a/program/src/rrd_afm.c b/program/src/rrd_afm.c
index b402017b87b259f4d4d8a806a02191a4a7455cf3..1afded1a95a91216fcaeb7262a002753ff6ee68a 100644 (file)
--- a/program/src/rrd_afm.c
+++ b/program/src/rrd_afm.c
@@ -6,13 +6,7 @@
  * $Id$
 */
 
-#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
 
 #include "rrd_afm.h"
 #include "rrd_afm_data.h"

diff --git a/program/src/rrdupdate.c b/program/src/rrdupdate.c
index 0e2af1114ffcaaf967e0e5097650c988cffffa1f..c3ff6f700ce224a619e98d760046f7f3020f1434 100644 (file)
--- a/program/src/rrdupdate.c
+++ b/program/src/rrdupdate.c
@@ -6,13 +6,7 @@
  * $Id$
  *****************************************************************************/
 
-#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
 
 #include "rrd.h"
 
@@ -20,7 +14,7 @@ int
 main(int argc, char **argv){
         rrd_update(argc,argv);
         if (rrd_test_error()) {
-                printf("RRDtool " PACKAGE_VERSION "  Copyright by Tobi Oetiker, 1997-2008\n\n"
+                printf("RRDtool " PACKAGE_VERSION "  Copyright by Tobi Oetiker, 1997-2009\n\n"
                         "Usage: rrdupdate filename\n"
                         "\t\t\t[--template|-t ds-name:ds-name:...]\n"
                         "\t\t\ttime|N:value[:value...]\n\n"

diff --git a/program/win32/rrd_config.h.msvc b/program/win32/rrd_config.h.msvc
index 8a839239cec8726f00b32a717d828a500af5d161..62bf9876dc286504288b8c8519f9f6b69f8f512c 100644 (file)
--- a/program/win32/rrd_config.h.msvc
+++ b/program/win32/rrd_config.h.msvc
@@ -1,65 +1,62 @@
-/* rrd_config.h.msvc. Hand-tweaked rrd_config.h for MSVC compiler. */\r
-#ifndef WIN32 \r
-#error This rrd_config.h is created for Win32 platform! \r
-#endif \r
-#ifndef RRD_CONFIG_H\r
-#define RRD_CONFIG_H\r
-\r
-#include <math.h>\r
-#include <float.h>\r
-#include <direct.h>\r
-\r
-/* the placeholders will be filled in by get_ver.awk */\r
-/* http://cm.bell-labs.com/cm/cs/awkbook/index.html */\r
-#define NUMVERS @@NUMVERS@@\r
-#define PACKAGE_VERSION "@@PACKAGE_VERSION@@"\r
-\r
-#define PACKAGE_NAME "rrdtool"\r
-#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION\r
-\r
-#define HAVE_STRFTIME 1\r
-#define HAVE_TIME_H 1\r
-#define HAVE_LOCALE_H 1\r
-#define HAVE_TZSET 1\r
-#define HAVE_SETLOCALE 1\r
-#define HAVE_MATH_H 1\r
-#define HAVE_FLOAT_H 1\r
-#define HAVE_MEMMOVE 1\r
-#define HAVE_MALLOC_H 1\r
-#define HAVE_MKTIME 1\r
-#define HAVE_STRFTIME 1\r
-#define HAVE_STRING_H 1\r
-#define HAVE_VSNPRINTF 1\r
-#define HAVE_SYS_TYPES_H 1\r
-#define HAVE_SYS_STAT_H 1\r
-\r
-/* Define to 1 if you have the ANSI C header files. */\r
-#define STDC_HEADERS 1\r
-\r
-#define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF)\r
-#define isnan _isnan\r
-#define finite _finite\r
-#define snprintf _snprintf\r
-#define vsnprintf _vsnprintf\r
-#define strftime strftime_ \r
-\r
-/* realloc does not support NULL as argument */\r
-#define NO_NULL_REALLOC 1\r
-#if NO_NULL_REALLOC\r
-# define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))\r
-#else\r
-# define rrd_realloc(a,b) realloc((a), (b))\r
-#endif      \r
-\r
-/* Vertical label angle: 90.0 (default) or 270.0 */\r
-#define RRDGRAPH_YLEGEND_ANGLE 90.0\r
-\r
-#define RRD_DEFAULT_FONT "arial.ttf"\r
-/* #define RRD_DEFAULT_FONT "DejaVuSansMono-Roman.ttf" */\r
-\r
-/* #define WITH_PIECHART 1 */\r
-\r
-/* #define DEBUG 1 */\r
-\r
-#endif /* RRD_CONFIG_H */\r
-\r
+/* rrd_config.h.msvc. Hand-tweaked rrd_config.h for MSVC compiler. */
+#ifndef _WIN32 
+#error This rrd_config.h is created for Win32 platform! 
+#endif 
+#ifndef RRD_CONFIG_H
+#define RRD_CONFIG_H
+
+/* the placeholders will be filled in by get_ver.awk */
+/* http://cm.bell-labs.com/cm/cs/awkbook/index.html */
+#define NUMVERS @@NUMVERS@@
+#define PACKAGE_VERSION "@@PACKAGE_VERSION@@"
+
+#define PACKAGE_NAME "rrdtool"
+#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION
+
+#define HAVE_STRFTIME 1
+#define HAVE_TIME_H 1
+#define HAVE_LOCALE_H 1
+#define HAVE_TZSET 1
+#define HAVE_SETLOCALE 1
+#define HAVE_MATH_H 1
+#define HAVE_FLOAT_H 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MKTIME 1
+#define HAVE_STRFTIME 1
+#define HAVE_STRING_H 1
+#define HAVE_VSNPRINTF 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+#define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF)
+#define isnan _isnan
+#define finite _finite
+#define snprintf _snprintf
+#define vsnprintf _vsnprintf
+#define strcasecmp stricmp
+#define strftime strftime_ 
+
+/* realloc does not support NULL as argument */
+#define NO_NULL_REALLOC 1
+#if NO_NULL_REALLOC
+# define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))
+#else
+# define rrd_realloc(a,b) realloc((a), (b))
+#endif      
+
+/* Vertical label angle: 90.0 (default) or 270.0 */
+#define RRDGRAPH_YLEGEND_ANGLE 90.0
+
+#define RRD_DEFAULT_FONT "arial.ttf"
+/* #define RRD_DEFAULT_FONT "DejaVuSansMono-Roman.ttf" */
+
+/* #define WITH_PIECHART 1 */
+
+/* #define DEBUG 1 */
+
+#endif /* RRD_CONFIG_H */
+