Fix build errors (MinGW-w64)

- rrd.h, fixed build error:
  rrd.h:66:17: error: conflicting types for 'ssize_t'
  typedef size_t ssize_t;
  Remark: MinGW-w64 has ssize_t and off_t
- rrd_restore.c, fixed build error:
  rrd_restore.c:29:17: error: conflicting types for 'ssize_t'
  typedef size_t ssize_t;
- rrd_utils.c, fixed build error:
  rrd_utils.c:226:10: error: too many arguments to function 'mkdir'
     if ((mkdir(pathname, mode) != 0) && (errno != EEXIST)) {

diff --git a/src/rrd.h b/src/rrd.h
index 873c5b0d31573241098b0ba3461d8af65d07c07a..0fb5f072490205896ae8dd3dfea5198ee2f7ddb7 100644 (file)
--- a/src/rrd.h
+++ b/src/rrd.h
@@ -63,9 +63,11 @@ extern    "C" {
 #endif
        #define strtoll _strtoi64 
 #endif
+#ifndef __MINGW32__     /* MinGW-w64 has ssize_t and off_t */
        typedef size_t ssize_t;
        typedef long off_t;
-#endif 
+#endif
+#endif
 
 #include <time.h>
 #include <stdio.h>      /* for FILE */

diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index 9c7f7cfdf7e163837831dcb4106759c4facf64d4..1afe753dd651e915c9afd7d6651fb73ceb776803 100644 (file)
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
@@ -26,9 +26,11 @@
 #ifndef WIN32
 #      include <unistd.h>     /* for off_t */
 #else
+#ifndef __MINGW32__     /* MinGW-w64 has ssize_t and off_t */
        typedef size_t ssize_t;
        typedef long off_t;
-#endif 
+#endif
+#endif
 
 #include <fcntl.h>
 #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)

diff --git a/src/rrd_utils.c b/src/rrd_utils.c
index 12e016eb6f162ecceb66a989902f6ae031a2bfb4..f26be8cce756d7fc550604baa9c65f85bd5fa945 100644 (file)
--- a/src/rrd_utils.c
+++ b/src/rrd_utils.c
@@ -217,7 +217,7 @@ int rrd_mkdir_p(const char *pathname_unsafe, mode_t mode)
     free(base_dir);
 
     /* keep errno as set by mkdir() */
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__MINGW32__)
     if (0 != mkdir(pathname)) {
         free(pathname);
         return -1;