summaryrefslogtreecommitdiffstats
path: root/getopt
diff options
context:
space:
mode:
authorKarel Zak2008-11-26 14:25:25 +0100
committerKarel Zak2008-11-26 14:25:25 +0100
commitd7327f20924a993a55573666149149b72ea8af32 (patch)
treecb84e729e3f6b5911c26b716d75580bc9d8be4d9 /getopt
parentfdisk: rename ENABLE_CMDTAGQ macro (diff)
downloadkernel-qcow2-util-linux-d7327f20924a993a55573666149149b72ea8af32.tar.gz
kernel-qcow2-util-linux-d7327f20924a993a55573666149149b72ea8af32.tar.xz
kernel-qcow2-util-linux-d7327f20924a993a55573666149149b72ea8af32.zip
getopt: remove unnecessary ifdefs
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'getopt')
-rw-r--r--getopt/Makefile.am3
-rw-r--r--getopt/getopt.c8
2 files changed, 0 insertions, 11 deletions
diff --git a/getopt/Makefile.am b/getopt/Makefile.am
index 644d64118..58ae7fc38 100644
--- a/getopt/Makefile.am
+++ b/getopt/Makefile.am
@@ -1,9 +1,6 @@
include $(top_srcdir)/config/include-Makefile.am
usrbinexec_PROGRAMS = getopt
-
-getopt_CPPFLAGS = -DLIBCGETOPT=1 $(AM_CPPFLAGS)
-
dist_man_MANS = getopt.1
exampledir = $(datadir)/getopt/
diff --git a/getopt/getopt.c b/getopt/getopt.c
index 10396a0c6..29735e512 100644
--- a/getopt/getopt.c
+++ b/getopt/getopt.c
@@ -44,12 +44,7 @@
#include <string.h>
#include <unistd.h>
#include <ctype.h>
-
-#if LIBCGETOPT
#include <getopt.h>
-#else
-#include "getopt.h"
-#endif
#include "nls.h"
@@ -373,12 +368,9 @@ int main(int argc, char *argv[])
int opt;
int compatible=0;
-#if WITHOUT_GETTEXT
-#else
setlocale(LC_ALL,"");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
-#endif
init_longopt();