projects
/
external
/
binutils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4001ad8
)
merge from gcc
author
DJ Delorie
<dj@redhat.com>
Wed, 16 Oct 2002 13:47:35 +0000
(13:47 +0000)
committer
DJ Delorie
<dj@redhat.com>
Wed, 16 Oct 2002 13:47:35 +0000
(13:47 +0000)
include/ChangeLog
patch
|
blob
|
history
include/getopt.h
patch
|
blob
|
history
diff --git
a/include/ChangeLog
b/include/ChangeLog
index
257e381
..
d7564ef
100644
(file)
--- a/
include/ChangeLog
+++ b/
include/ChangeLog
@@
-1,3
+1,7
@@
+2002-10-11 David O'Brien <obrien@FreeBSD.org>
+
+ * getopt.h: getopt is in unistd.h (based on SUSv2).
+
2002-09-26 Jakub Jelinek <jakub@redhat.com>
* elf/x86-64.h: Add TLS relocs.
2002-09-26 Jakub Jelinek <jakub@redhat.com>
* elf/x86-64.h: Add TLS relocs.
diff --git
a/include/getopt.h
b/include/getopt.h
index
0c6470b
..
da09cee
100644
(file)
--- a/
include/getopt.h
+++ b/
include/getopt.h
@@
-108,7
+108,7
@@
struct option
#if !HAVE_DECL_GETOPT
#if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT)
/* Many other libraries have conflicting prototypes for getopt, with
#if !HAVE_DECL_GETOPT
#if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT)
/* Many other libraries have conflicting prototypes for getopt, with
- differences in the consts, in
stdlib
.h. To avoid compilation
+ differences in the consts, in
unistd
.h. To avoid compilation
errors, only prototype getopt for the GNU C library. */
extern int getopt (int argc, char *const *argv, const char *shortopts);
#else
errors, only prototype getopt for the GNU C library. */
extern int getopt (int argc, char *const *argv, const char *shortopts);
#else