projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include sys/time.h.
[gnulib.git]
/
lib
/
getopt1.c
diff --git
a/lib/getopt1.c
b/lib/getopt1.c
index
f784b57
..
22a7efb
100644
(file)
--- a/
lib/getopt1.c
+++ b/
lib/getopt1.c
@@
-1,35
+1,30
@@
/* getopt_long and getopt_long_only entry points for GNU getopt.
/* getopt_long and getopt_long_only entry points for GNU getopt.
- Copyright (C) 1987, 88, 89, 90, 91, 92, 1993
- Free Software Foundation, Inc.
+ Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
+ Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
- Th
is program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
+ Th
e GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+
version 2.1 of the License, or (at your option) any
later version.
- Th
is program
is distributed in the hope that it will be useful,
+ Th
e GNU C Library
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-
GNU
General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU
+
Lesser
General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
\f
#ifdef HAVE_CONFIG_H
\f
#ifdef HAVE_CONFIG_H
-#if defined (emacs) || defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
- using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
- (which it would do because it found this file in $srcdir). */
#include <config.h>
#include <config.h>
-#else
-#include "config.h"
-#endif
#endif
#include "getopt.h"
#endif
#include "getopt.h"
-#if
ndef
__STDC__
+#if
!defined __STDC__ || !
__STDC__
/* This is a separate conditional since some stdc systems
reject `defined (const)'. */
#ifndef const
/* This is a separate conditional since some stdc systems
reject `defined (const)'. */
#ifndef const
@@
-47,15
+42,21
@@
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. */
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. */
-#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
+#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__
#include <stdlib.h>
/* This needs to come after some library #include
to get __GNU_LIBRARY__ defined. */
#ifdef __GNU_LIBRARY__
#include <stdlib.h>
-#else
-char *getenv ();
#endif
#ifndef NULL
#endif
#ifndef NULL
@@
-90,7
+91,7
@@
getopt_long_only (argc, argv, options, long_options, opt_index)
}
}
-#endif /*
_LIBC or not __GNU_LIBRARY__
. */
+#endif /*
Not ELIDE_CODE
. */
\f
#ifdef TEST
\f
#ifdef TEST
@@
-121,7
+122,7
@@
main (argc, argv)
c = getopt_long (argc, argv, "abc:d:0123456789",
long_options, &option_index);
c = getopt_long (argc, argv, "abc:d:0123456789",
long_options, &option_index);
- if (c ==
EOF
)
+ if (c ==
-1
)
break;
switch (c)
break;
switch (c)