projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix warning: "__STRICT_ANSI__" is not defined warning patch by Gilles Esp
[rrdtool.git]
/
src
/
rrd_getopt.c
diff --git
a/src/rrd_getopt.c
b/src/rrd_getopt.c
index
f973471
..
46f7313
100644
(file)
--- a/
src/rrd_getopt.c
+++ b/
src/rrd_getopt.c
@@
-39,10
+39,11
@@
#endif
#endif
#endif
#endif
-
+#ifndef WIN32
#ifdef HAVE_CONFIG_H
#include "../rrd_config.h"
#endif
#ifdef HAVE_CONFIG_H
#include "../rrd_config.h"
#endif
+#endif
#include "rrd_i18n.h"
#include "rrd_i18n.h"
@@
-274,7
+275,8
@@
static char *const *original_argv;
to getopt is that one passed to the process. */
static void store_args(
int argc,
to getopt is that one passed to the process. */
static void store_args(
int argc,
- char *const *argv) __attribute__ ((unused));
+ char *const *argv);
+
static void store_args(
int argc,
char *const *argv)
static void store_args(
int argc,
char *const *argv)
@@
-359,7
+361,7
@@
static const char *_getopt_initialize(
const char *);
#endif
static const char* _getopt_initialize(int argc,
const char *);
#endif
static const char* _getopt_initialize(int argc,
- char** argv,
+ char*
const
* argv,
const char* optstring)
{
/* Start processing options with ARGV-element 1 (since ARGV-element 0
const char* optstring)
{
/* Start processing options with ARGV-element 1 (since ARGV-element 0
@@
-464,7
+466,11
@@
static const char* _getopt_initialize(int argc,
long-named options. */
int _getopt_internal(int argc,
long-named options. */
int _getopt_internal(int argc,
+#ifdef WIN32
char** argv,
char** argv,
+#else // WIN32
+ char* const* argv,
+#endif //WIN32
const char *optstring,
const struct option *longopts,
int* longind,
const char *optstring,
const struct option *longopts,
int* longind,
@@
-868,15
+874,6
@@
int _getopt_internal(int argc,
}
}
}
}
-int getopt(
- int argc,
- char** argv,
- const char* optstring)
-{
- return _getopt_internal(argc, argv, optstring,
- (const struct option *) 0, (int *) 0, 0);
-}
-
#endif /* Not ELIDE_CODE. */
\f
#ifdef TEST
#endif /* Not ELIDE_CODE. */
\f
#ifdef TEST