updates for netware and mingw32 ... allows for crosscompilation

[rrdtool.git] / src / rrd_update.c

diff --git a/src/rrd_update.c b/src/rrd_update.c
index 2b375789a230a7e0bf789fde5af93f34ce384bbd..352e043d0aa76a5e3a104ad91b88dfd5b07f5281 100644 (file)
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.24  Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.2.26  Copyright by Tobi Oetiker, 1997-2007
  *****************************************************************************
  * rrd_update.c  RRD Update Function
  *****************************************************************************
@@ -9,9 +9,6 @@
 #include "rrd_tool.h"
 #include <sys/types.h>
 #include <fcntl.h>
-#ifdef HAVE_MMAP
-# include <sys/mman.h>
-#endif
 
 #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
  #include <sys/locking.h>
@@ -32,12 +29,15 @@
  */
 #include <sys/timeb.h>
 
-#ifndef __MINGW32__
+#if (defined(__MINGW32__) && \
+       ((__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 12) || __MINGW32_MAJOR_VERSION > 3))
+#include <sys/time.h>
+#else
+
 struct timeval {
        time_t tv_sec; /* seconds */
        long tv_usec;  /* microseconds */
 };
-#endif
 
 struct __timezone {
        int  tz_minuteswest; /* minutes W of Greenwich */
@@ -56,7 +56,9 @@ static int gettimeofday(struct timeval *t, struct __timezone *tz) {
        return 0;
 }
 
+#endif /* mingw32 3.4.5 */
 #endif
+
 /*
  * normilize time as returned by gettimeofday. usec part must
  * be always >= 0
@@ -427,10 +429,10 @@ _rrd_update(const char *filename, const char *tmplt, int argc, const char **argv
         fclose(rrd_file);
        return(-1);
     }
-#ifdef HAVE_MADVISE
+#ifdef USE_MADVISE
     /* when we use mmaping we tell the kernel the mmap equivalent
        of POSIX_FADV_RANDOM */
-    madvise(rrd_mmaped_file,rrd_filesize,POSIX_MADV_RANDOM);
+    madvise(rrd_mmaped_file,rrd_filesize,MADV_RANDOM);
 #endif
 #endif
     /* loop through the arguments. */