X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.h;h=350183b07524d959a5f3eb776637c072a82ba1c6;hb=db29017f473c15fa6b8f0490093f339fb3f5424e;hp=37f4a7ed53447dd5b2d4945b690d8191955e86a0;hpb=bac209eb1d120c27acc1ede8fa7dfef81f3eaaf1;p=rrdtool.git

diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index 37f4a7e..350183b 100644
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2rc3  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.12  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * rrd_tool.h   Common Header File
  *****************************************************************************/
@@ -11,7 +11,7 @@ extern "C" {
 #ifndef _RRD_TOOL_H
 #define _RRD_TOOL_H
 
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
 #include "../confignt/config.h"
 #else
 #ifdef HAVE_CONFIG_H
@@ -95,11 +95,18 @@ extern int getrusage(int, struct rusage *);
 
 #include "rrd.h"
 
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
 
 /* Win32 only includes */
 
 #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)
@@ -107,6 +114,7 @@ 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