merged updated win32 port by Larry Adams and the cacti team

[rrdtool.git] / src / rrd_getopt1.c

diff --git a/src/rrd_getopt1.c b/src/rrd_getopt1.c
index 1ace77e..ea9ed54 100644 (file)
--- a/src/rrd_getopt1.c
+++ b/src/rrd_getopt1.c
@@ -28,9 +28,11 @@
 #endif
 #endif
 
+#ifndef WIN32
 #ifdef HAVE_CONFIG_H
 #include "../rrd_config.h"
 #endif
+#endif
 
 #include "rrd_getopt.h"
 
@@ -66,7 +68,11 @@
 #endif
 
 int getopt_long(int argc,
+#ifdef WIN32
                 char** argv,
+#else // WIN32
+                char* const* argv,
+#endif //WIN32
                 const char* options,
                 const struct option* long_options,
                 int* opt_index)
@@ -80,7 +86,11 @@ int getopt_long(int argc,
    instead.  */
 
 int getopt_long_only(int argc,
+#ifdef WIN32
                      char** argv,
+#else // WIN32
+                     char* const* argv,
+#endif //WIN32
                      const char* options,
                      const struct option* long_options,
                      int* opt_index)