projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use standard functions for checking
[rrdtool.git]
/
src
/
rrd_getopt1.c
diff --git
a/src/rrd_getopt1.c
b/src/rrd_getopt1.c
index
075bc8d
..
ea9ed54
100644
(file)
--- a/
src/rrd_getopt1.c
+++ b/
src/rrd_getopt1.c
@@
-20,7
+20,7
@@
Boston, MA 02111-1307, USA. */
\f
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
/* This is a separate conditional since some stdc systems
reject `defined (const)'. */
#ifndef const
@@
-28,9
+28,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_getopt.h"
#include "rrd_getopt.h"
@@
-65,17
+67,15
@@
#define NULL 0
#endif
#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,
+#ifdef WIN32
+ char** argv,
+#else // WIN32
+ char* const* argv,
+#endif //WIN32
+ const char* options,
+ const struct option* long_options,
+ int* opt_index)
{
return _getopt_internal(argc, argv, options, long_options, opt_index, 0);
}
{
return _getopt_internal(argc, argv, options, long_options, opt_index, 0);
}
@@
-85,17
+85,15
@@
int getopt_long(
but does match a short option, it is parsed as a short option
instead. */
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,
+#ifdef WIN32
+ char** argv,
+#else // WIN32
+ char* const* argv,
+#endif //WIN32
+ const char* options,
+ const struct option* long_options,
+ int* opt_index)
{
return _getopt_internal(argc, argv, options, long_options, opt_index, 1);
}
{
return _getopt_internal(argc, argv, options, long_options, opt_index, 1);
}