summaryrefslogtreecommitdiff
path: root/lib/getopt.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2004-08-20 02:10:15 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2004-08-20 02:10:15 +0000
commit529a7c21fd1950e3a1e5a4ec429b6e2c12f619d8 (patch)
tree9a4e62d84b9123b7ed14fbe3f071e1d5436e6487 /lib/getopt.c
parent463f2060b7f399676d25a598aa4ec45ec8e3cb07 (diff)
downloadcoreutils-529a7c21fd1950e3a1e5a4ec429b6e2c12f619d8.tar.xz
Sync getopt from gnulib.
Diffstat (limited to 'lib/getopt.c')
-rw-r--r--lib/getopt.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/lib/getopt.c b/lib/getopt.c
index afc284843..95b3604f8 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -3,7 +3,7 @@
"Keep this file name-space clean" means, talk to drepper@gnu.org
before changing it!
Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004
- Free Software Foundation, Inc.
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
@@ -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__
@@ -1181,7 +1162,6 @@ getopt (int argc, char *const *argv, const char *optstring)
0);
}
-#endif /* Not ELIDE_CODE. */
#ifdef TEST