From d47ebec347838896f4c94b66ba4bbdd3b0d9f201 Mon Sep 17 00:00:00 2001 From: oetiker Date: Sun, 25 Jan 2009 21:57:19 +0000 Subject: [PATCH] more win32 fixes by guenter knauf git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@1743 a5681a0c-68f1-0310-ab6d-d61299d08faa --- program/configure.ac | 2 +- program/src/rrd_afm.c | 6 -- program/src/rrdupdate.c | 8 +- program/win32/rrd_config.h.msvc | 127 ++++++++++++++++---------------- 4 files changed, 64 insertions(+), 79 deletions(-) diff --git a/program/configure.ac b/program/configure.ac index 58fadc7e..a9db815b 100644 --- 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 b402017b..1afded1a 100644 --- 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 0e2af111..c3ff6f70 100644 --- 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 8a839239..62bf9876 100644 --- 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. */ -#ifndef WIN32 -#error This rrd_config.h is created for Win32 platform! -#endif -#ifndef RRD_CONFIG_H -#define RRD_CONFIG_H - -#include -#include -#include - -/* 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 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 */ - +/* 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 */ + -- 2.30.2