/*****************************************************************************
- * RRDtool 1.2.17 Copyright by Tobi Oetiker, 1997-2006
+ * RRDtool 1.2.19 Copyright by Tobi Oetiker, 1997-2007
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************/
#ifndef _RRD_TOOL_H
#define _RRD_TOOL_H
-#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
+#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#include "../win32/config.h"
#endif
#ifdef MUST_DISABLE_SIGFPE
#endif
/* local include files -- need to be after the system ones */
-#include "getopt.h"
+#include "rrd_getopt.h"
#include "rrd_format.h"
#ifndef max