X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetopt.c;h=95b3604f892d4e2ed66fdc6be0b6bdb36af9d2ff;hb=6dc8b58f2a657faf8c1dd2e9438faab2a016c034;hp=6127ed17890746df5d4fd4c3eca3e8bbc27ca614;hpb=32eb10d74312345d903e28d73699b75dd58115d2;p=gnulib.git

diff --git a/lib/getopt.c b/lib/getopt.c
index 6127ed178..95b3604f8 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -32,25 +32,6 @@
 
 #include <stdio.h>
 
-/* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself.  This code is part of the GNU C
-   Library, but also included in many other GNU distributions.  Compiling
-   and linking in this code is a waste when using the GNU C library
-   (especially if it is a shared library).  Rather than having every GNU
-   program understand `configure --with-gnu-libc' and omit the object files,
-   it is simpler to just do this in the source for each such file.  */
-
-#define GETOPT_INTERFACE_VERSION 2
-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
-# include <gnu-versions.h>
-# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-#  define ELIDE_CODE
-# endif
-#endif
-
-#ifndef ELIDE_CODE
-
-
 /* This needs to come after some library #include
    to get __GNU_LIBRARY__ defined.  */
 #ifdef	__GNU_LIBRARY__
@@ -70,8 +51,8 @@
 # include <libintl.h>
 #else
 # include "gettext.h"
+# define _(msgid) gettext (msgid)
 #endif
-#define _(msgid) gettext (msgid)
 
 #if defined _LIBC && defined USE_IN_LIBIO
 # include <wchar.h>
@@ -1181,7 +1162,6 @@ getopt (int argc, char *const *argv, const char *optstring)
 			   0);
 }
 
-#endif	/* Not ELIDE_CODE.  */
 
 #ifdef TEST