diff options
| author | aj <aj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-05-16 13:52:39 +0000 |
|---|---|---|
| committer | aj <aj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-05-16 13:52:39 +0000 |
| commit | 77f60c55d4cf3eecdb827d230d906ceda8948b67 (patch) | |
| tree | b7ca97ec1705022db2618739fdb19572ea51b18d | |
| parent | 5c5ccba291e6d6a7763b8b2a773503c7a0659306 (diff) | |
| download | linaro-gcc-77f60c55d4cf3eecdb827d230d906ceda8948b67.tar.gz linaro-gcc-77f60c55d4cf3eecdb827d230d906ceda8948b67.tar.bz2 linaro-gcc-77f60c55d4cf3eecdb827d230d906ceda8948b67.zip | |
* getpwd.c: Remove unneeded prototype getcwd and move getwd so
that it's only declared if needed.
* getopt1.c: Change order of includes so that __GNU_LIBRARY__ is
defined.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99775 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libiberty/ChangeLog | 8 | ||||
| -rw-r--r-- | libiberty/getopt1.c | 6 | ||||
| -rw-r--r-- | libiberty/getpwd.c | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 794e147048d..9b5a09475a3 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,11 @@ +2005-05-16 Andreas Jaeger <aj@suse.de> + + * getpwd.c: Remove unneeded prototype getcwd and move getwd so + that it's only declared if needed. + + * getopt1.c: Change order of includes so that __GNU_LIBRARY__ is + defined. + 2005-05-15 Andreas Jaeger <aj@suse.de> * functions.texi: Regenerated. diff --git a/libiberty/getopt1.c b/libiberty/getopt1.c index 6fc75a62ab7..255b1445637 100644 --- a/libiberty/getopt1.c +++ b/libiberty/getopt1.c @@ -1,5 +1,5 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98 + Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2005 Free Software Foundation, Inc. NOTE: This source is derived from an old version taken from the GNU C @@ -24,8 +24,6 @@ #include <config.h> #endif -#include "getopt.h" - #if !defined __STDC__ || !__STDC__ /* This is a separate conditional since some stdc systems reject `defined (const)'. */ @@ -36,6 +34,8 @@ #include <stdio.h> +#include "getopt.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 diff --git a/libiberty/getpwd.c b/libiberty/getpwd.c index e57ef47e947..c7880d70444 100644 --- a/libiberty/getpwd.c +++ b/libiberty/getpwd.c @@ -39,10 +39,6 @@ extern int errno; #include <limits.h> #endif -/* Prototype these in case the system headers don't provide them. */ -extern char *getpwd (); -extern char *getwd (); - #include "libiberty.h" /* Virtually every UN*X system now in common use (except for pre-4.3-tahoe @@ -50,6 +46,8 @@ extern char *getwd (); the few exceptions to the general rule here. */ #if !defined(HAVE_GETCWD) && defined(HAVE_GETWD) +/* Prototype in case the system headers doesn't provide it. */ +extern char *getwd (); #define getcwd(buf,len) getwd(buf) #endif |