X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Frrd_getopt.c;h=b389aaa53391281f49daba5df73c0918ac358bc9;hb=8b01cbe023a7c412f1131013840ed078fdb6e65c;hp=d03b456e8297cc8d7446c848b56fa77ef9c8578a;hpb=7d0d6b07c9f5bd5dfd99aa7fe9826eebf2181f1f;p=rrdtool.git diff --git a/src/rrd_getopt.c b/src/rrd_getopt.c index d03b456..b389aaa 100644 --- a/src/rrd_getopt.c +++ b/src/rrd_getopt.c @@ -34,6 +34,8 @@ #include "../rrd_config.h" #endif +#include "rrd_i18n.h" + #if !defined (__STDC__) || !__STDC__ /* This is a separate conditional since some stdc systems reject `defined (const)'. */ @@ -85,17 +87,6 @@ #define getpid() GetCurrentProcessId() #endif -#ifndef _ -/* This is for other GNU distributions with internationalized messages. - When compiling libc, the _ macro is predefined. */ -#ifdef HAVE_LIBINTL_H -# include -# define _(msgid) gettext (msgid) -#else -# define _(msgid) (msgid) -#endif -#endif - /* This version of `getopt' appears to the caller like standard Unix `getopt' but it behaves differently for the user, since it allows the user to intersperse the options with the other arguments. @@ -190,7 +181,7 @@ int optopt = '?'; of the value of `ordering'. In the case of RETURN_IN_ORDER, only `--' can cause `getopt' to return -1 with `optind' != ARGC. */ -static const enum { +static enum { REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER } ordering;