X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Frrd_getopt1.c;h=ea9ed54568bc731b5e7da29efd5ea89691205e9f;hb=a64734515aa37905d7cacaad7f5e1e7b28945947;hp=724e1a5d9319ab1ae9cbc49dbf848d4a48df4dba;hpb=be3cca08c4031f46d4e2b872ab0eb825c5b69b4e;p=pkg-rrdtool.git

diff --git a/src/rrd_getopt1.c b/src/rrd_getopt1.c
index 724e1a5..ea9ed54 100644
--- a/src/rrd_getopt1.c
+++ b/src/rrd_getopt1.c
@@ -19,19 +19,20 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef WIN32
-#if !defined (__STDC__) || !__STDC__
+
+#if !defined WIN32 && (!defined (__STDC__) || !__STDC__)
 /* This is a separate conditional since some stdc systems
    reject `defined (const)'.  */
 #ifndef const
 #define const
 #endif
 #endif
-#endif // WIN32
 
+#ifndef WIN32
 #ifdef HAVE_CONFIG_H
 #include "../rrd_config.h"
 #endif
+#endif
 
 #include "rrd_getopt.h"
 
@@ -66,25 +67,15 @@
 #define NULL 0
 #endif
 
-#ifdef WIN32
 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)
-#else // WIN32
-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;
-#endif // WIN32
 {
     return _getopt_internal(argc, argv, options, long_options, opt_index, 0);
 }
@@ -94,25 +85,15 @@ int getopt_long(
    but does match a short option, it is parsed as a short option
    instead.  */
 
-#ifdef WIN32
 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)
-#else // WIN32
-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;
-#endif // WIN32
 {
     return _getopt_internal(argc, argv, options, long_options, opt_index, 1);
 }