X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=program%2Fsrc%2Frrd_tool.h;h=01cf62157543d554f880031d7223bce855a7c7f5;hb=3a856c49a6374cf7a17c3c5be67d1ddd96b3b0f6;hp=ed08c79c681f60adfa34cbf9ce5099a469e7dd4b;hpb=ab533f8aa838fadcfd13fbea1846590b0d8ae5d2;p=rrdtool-all.git

diff --git a/program/src/rrd_tool.h b/program/src/rrd_tool.h
index ed08c79c..01cf6215 100644
--- a/program/src/rrd_tool.h
+++ b/program/src/rrd_tool.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.6  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
@@ -100,9 +100,13 @@ extern int getrusage(int, struct rusage *);
 /* Win32 only includes */
 
 #include <float.h>        /* for _isnan  */
+#include <io.h>           /* for chdir   */
+
+#ifndef __MINGW32__
 #define isnan _isnan
 #define finite _finite
 #define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF)
+#endif
 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);