diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index de67b64210db8212e0cdfba00df557b81cf1f6d8..2294cf9f299d72124fff4626dcc807835b9b8153 100644 (file)
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
/*****************************************************************************
- * RRDtool 1.2.11 Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.15 Copyright by Tobi Oetiker, 1997-2006
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************/
#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
/* 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);