X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_getopt1.c;h=ea9ed54568bc731b5e7da29efd5ea89691205e9f;hb=afcd0eb5b0e71964e9c5691b4a9794c2f4059928;hp=075bc8da48b79643af6794ddfc5c51270693982a;hpb=72d1c36855e2f0d8638a21290e9eb0fb0bb05f2b;p=rrdtool.git diff --git a/src/rrd_getopt1.c b/src/rrd_getopt1.c index 075bc8d..ea9ed54 100644 --- a/src/rrd_getopt1.c +++ b/src/rrd_getopt1.c @@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA. */ -#if !defined (__STDC__) || !__STDC__ +#if !defined WIN32 && (!defined (__STDC__) || !__STDC__) /* This is a separate conditional since some stdc systems reject `defined (const)'. */ #ifndef const @@ -28,9 +28,11 @@ #endif #endif +#ifndef WIN32 #ifdef HAVE_CONFIG_H #include "../rrd_config.h" #endif +#endif #include "rrd_getopt.h" @@ -65,17 +67,15 @@ #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); } @@ -85,17 +85,15 @@ 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, +#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); }