X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_getopt.c;h=50a61e882ea76d13104285a6b30d9af92adff995;hb=4d7e379201b4cf3dbdad103d691ca7d2724ade2f;hp=706a67ab8b3ec3fbd8f781ec85bf0639ef2109db;hpb=c1a96caa82a48ed49a02c92e9d79e93b95ef3b06;p=rrdtool.git diff --git a/src/rrd_getopt.c b/src/rrd_getopt.c index 706a67a..50a61e8 100644 --- a/src/rrd_getopt.c +++ b/src/rrd_getopt.c @@ -30,10 +30,6 @@ #define _NO_PROTO #endif -#ifdef HAVE_CONFIG_H -#include "../rrd_config.h" -#endif - #if !defined (__STDC__) || !__STDC__ /* This is a separate conditional since some stdc systems reject `defined (const)'. */ @@ -42,6 +38,14 @@ #endif #endif + +#ifdef HAVE_CONFIG_H +#include "../rrd_config.h" +#endif + +#include "rrd_i18n.h" + + #include /* Comment out all this code if we are using the GNU C Library, and are not @@ -85,17 +89,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.