X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_getopt.c;h=dbb3f3f76dd76630b112c01e875adcf657d2a2af;hp=b389aaa53391281f49daba5df73c0918ac358bc9;hb=aff0a2728543eee1ac21f3fa02f171caae8d9362;hpb=8fafd09727d58545c1229ca84b94f0082af6a528

diff --git a/src/rrd_getopt.c b/src/rrd_getopt.c
index b389aaa..dbb3f3f 100644
--- a/src/rrd_getopt.c
+++ b/src/rrd_getopt.c
@@ -30,13 +30,8 @@
 #define _NO_PROTO
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "../rrd_config.h"
-#endif
 
-#include "rrd_i18n.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
@@ -44,6 +39,14 @@
 #endif
 #endif
 
+
+#ifdef HAVE_CONFIG_H
+#include "../rrd_config.h"
+#endif
+
+#include "rrd_i18n.h"
+
+
 #include <stdio.h>
 
 /* Comment out all this code if we are using the GNU C Library, and are not
@@ -205,11 +208,7 @@ static char *posixly_correct;
 char     *getenv(
     );
 
-static char *my_index(
-    str,
-    chr)
-    const char *str;
-    int chr;
+static char* my_index(const char* str, int chr)
 {
     while (*str) {
         if (*str == chr)
@@ -286,9 +285,7 @@ static void exchange(
     char **);
 #endif
 
-static void exchange(
-    argv)
-    char    **argv;
+static void exchange(char** argv)
 {
     int       bottom = first_nonopt;
     int       middle = last_nonopt;
@@ -344,13 +341,9 @@ static const char *_getopt_initialize(
     char *const *,
     const char *);
 #endif
-static const char *_getopt_initialize(
-    argc,
-    argv,
-    optstring)
-    int argc;
-    char     *const *argv;
-    const char *optstring;
+static const char* _getopt_initialize(int argc,
+                                      char** argv,
+                                      const char* optstring)
 {
     /* Start processing options with ARGV-element 1 (since ARGV-element 0
        is the program name); the sequence of previously skipped
@@ -453,19 +446,12 @@ static const char *_getopt_initialize(
    If LONG_ONLY is nonzero, '-' as well as '--' can introduce
    long-named options.  */
 
-int _getopt_internal(
-    argc,
-    argv,
-    optstring,
-    longopts,
-    longind,
-    long_only)
-    int argc;
-    char     *const *argv;
-    const char *optstring;
-    const struct option *longopts;
-    int      *longind;
-    int long_only;
+int _getopt_internal(int argc,
+                     char** argv,
+                     const char *optstring,
+                     const struct option *longopts,
+                     int* longind,
+                     int long_only)
 {
     optarg = NULL;
 
@@ -866,12 +852,9 @@ int _getopt_internal(
 }
 
 int getopt(
-    argc,
-    argv,
-    optstring)
-    int argc;
-    char     *const *argv;
-    const char *optstring;
+    int argc,
+    char** argv,
+    const char* optstring)
 {
     return _getopt_internal(argc, argv, optstring,
                             (const struct option *) 0, (int *) 0, 0);