X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_getopt1.c;h=1ace77e24c9157e5254a485d0866b417bc5411e8;hp=6ace7943cd546794225f2d57258879e086c84a73;hb=85cd3f3afae48026843bea34d2d0d1056ee9dda5;hpb=2a6a270edfda89b04722b42b57992907f871c671

diff --git a/src/rrd_getopt1.c b/src/rrd_getopt1.c
index 6ace794..1ace77e 100644
--- a/src/rrd_getopt1.c
+++ b/src/rrd_getopt1.c
@@ -19,13 +19,8 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifdef HAVE_CONFIG_H
-#include "../rrd_config.h"
-#endif
-
-#include "rrd_getopt.h"
 
-#if !defined (__STDC__) || !__STDC__
+#if !defined WIN32 && (!defined (__STDC__) || !__STDC__)
 /* This is a separate conditional since some stdc systems
    reject `defined (const)'.  */
 #ifndef const
@@ -33,6 +28,12 @@
 #endif
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "../rrd_config.h"
+#endif
+
+#include "rrd_getopt.h"
+
 #include <stdio.h>
 
 /* Comment out all this code if we are using the GNU C Library, and are not
@@ -64,17 +65,11 @@
 #define NULL 0
 #endif
 
-int getopt_long(
-    argc,
-    argv,
-    options,
-    long_options,
-    opt_index)
-    int argc;
-    char     *const *argv;
-    const char *options;
-    const struct option *long_options;
-    int      *opt_index;
+int getopt_long(int argc,
+                char** argv,
+                const char* options,
+                const struct option* long_options,
+                int* opt_index)
 {
     return _getopt_internal(argc, argv, options, long_options, opt_index, 0);
 }
@@ -84,17 +79,11 @@ int getopt_long(
    but does match a short option, it is parsed as a short option
    instead.  */
 
-int getopt_long_only(
-    argc,
-    argv,
-    options,
-    long_options,
-    opt_index)
-    int argc;
-    char     *const *argv;
-    const char *options;
-    const struct option *long_options;
-    int      *opt_index;
+int getopt_long_only(int argc,
+                     char** argv,
+                     const char* options,
+                     const struct option* long_options,
+                     int* opt_index)
 {
     return _getopt_internal(argc, argv, options, long_options, opt_index, 1);
 }
@@ -114,19 +103,19 @@ int main(
 {
     int       c;
     int       digit_optind = 0;
+    struct option long_options[] = {
+        {"add", 1, 0, 0},
+        {"append", 0, 0, 0},
+        {"delete", 1, 0, 0},
+        {"verbose", 0, 0, 0},
+        {"create", 0, 0, 0},
+        {"file", 1, 0, 0},
+        {0, 0, 0, 0}
+    };
 
     while (1) {
         int       this_option_optind = optind ? optind : 1;
         int       option_index = 0;
-        static struct option long_options[] = {
-            {"add", 1, 0, 0},
-            {"append", 0, 0, 0},
-            {"delete", 1, 0, 0},
-            {"verbose", 0, 0, 0},
-            {"create", 0, 0, 0},
-            {"file", 1, 0, 0},
-            {0, 0, 0, 0}
-        };
 
         c = getopt_long(argc, argv, "abc:d:0123456789",
                         long_options, &option_index);