projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix file generation
[rrdtool.git]
/
src
/
rrd_tool.h
diff --git
a/src/rrd_tool.h
b/src/rrd_tool.h
index
c788066
..
e1a7961
100644
(file)
--- a/
src/rrd_tool.h
+++ b/
src/rrd_tool.h
@@
-1,5
+1,5
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.2
rc7
Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2
.11
Copyright by Tobi Oetiker, 1997-2005
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************/
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************/
@@
-11,7
+11,7
@@
extern "C" {
#ifndef _RRD_TOOL_H
#define _RRD_TOOL_H
#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
#include "../confignt/config.h"
#else
#ifdef HAVE_CONFIG_H
@@
-95,11
+95,17
@@
extern int getrusage(int, struct rusage *);
#include "rrd.h"
#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 */
/* Win32 only includes */
#include <float.h> /* for _isnan */
+#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)
#define isnan _isnan
#define finite _finite
#define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF)
@@
-107,6
+113,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);
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
#else