make rrdtool use rrd_config.h instead of config.h since this is just bound to lead...

[rrdtool.git] / src / rrd_tool.h

diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index 350183b..bb96194 100644 (file)
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.12  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.15  Copyright by Tobi Oetiker, 1997-2006
  *****************************************************************************
  * rrd_tool.h   Common Header File
  *****************************************************************************/
@@ -12,10 +12,10 @@ extern "C" {
 #define _RRD_TOOL_H
 
 #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
-#include "../confignt/config.h"
+#include "../win32/config.h"
 #else
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "../rrd_config.h"
 #endif
 #endif
 
@@ -101,20 +101,11 @@ extern int getrusage(int, struct rusage *);
 
 #include <float.h>        /* for _isnan  */
 #include <io.h>           /* for chdir   */
-#ifdef __MINGW32__
-#define localtime_r(a,b) localtime(a)
-#define ctime_r(a,b) ctime(a)
-#define gmtime_r(a,b) gmtime(a)
-#define strtok_r(a,b,c) strtok(a,b)
-#else
-#define isnan _isnan
-#define finite _finite
-#define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF)
+
 struct tm* localtime_r(const time_t *timep, struct tm* result);
 char* ctime_r(const time_t *timep, char* result);
 struct tm* gmtime_r(const time_t *timep, struct tm* result);
 char *strtok_r(char *str, const char *sep, char **last);
-#endif
 
 #else