From 8f3f62dcc4a7ea403bd3cbbf860364f192507014 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 12 Aug 2004 07:59:56 +0000 Subject: [PATCH] Remove ELIDE_CODE hack. --- lib/getopt.c | 20 -------------------- lib/getopt1.c | 20 -------------------- 2 files changed, 40 deletions(-) diff --git a/lib/getopt.c b/lib/getopt.c index 8f017f87b..95b3604f8 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -32,25 +32,6 @@ #include -/* 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 -# 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__ @@ -1181,7 +1162,6 @@ getopt (int argc, char *const *argv, const char *optstring) 0); } -#endif /* Not ELIDE_CODE. */ #ifdef TEST diff --git a/lib/getopt1.c b/lib/getopt1.c index 7671eba37..706f59c08 100644 --- a/lib/getopt1.c +++ b/lib/getopt1.c @@ -30,25 +30,6 @@ #include -/* 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 -#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__ @@ -96,7 +77,6 @@ _getopt_long_only_r (int argc, char *const *argv, const char *options, 1, d); } -#endif /* Not ELIDE_CODE. */ #ifdef TEST -- 2.11.0