Attached a patch for the rrd-tool LIBDBI integration with the following improvements:

[rrdtool.git] / src / rrd_getopt1.c

diff --git a/src/rrd_getopt1.c b/src/rrd_getopt1.c
index 075bc8d..1ace77e 100644 (file)
--- a/src/rrd_getopt1.c
+++ b/src/rrd_getopt1.c
@@ -20,7 +20,7 @@
    Boston, MA 02111-1307, USA.  */
 \f
 
-#if !defined (__STDC__) || !__STDC__
+#if !defined WIN32 && (!defined (__STDC__) || !__STDC__)
 /* This is a separate conditional since some stdc systems
    reject `defined (const)'.  */
 #ifndef const
@@ -65,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);
 }
@@ -85,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);
 }