git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

getpwd.c: Remove unneeded prototype getcwd and move getwd so that it's only declared if... 

* 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.

From-SVN: r99775
This commit is contained in:
Andreas Jaeger 2005-05-16 15:52:39 +02:00 committed by Andreas Jaeger
parent aeb70e782a
commit 99e4078fec
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libiberty/ChangeLog
View File

@ -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> 2005-05-15 Andreas Jaeger <aj@suse.de>
* functions.texi: Regenerated. * functions.texi: Regenerated.

6
libiberty/getopt1.c
View File

@ -1,5 +1,5 @@
/* 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,93,94,96,97,98 Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2005
Free Software Foundation, Inc. Free Software Foundation, Inc.
NOTE: This source is derived from an old version taken from the GNU C NOTE: This source is derived from an old version taken from the GNU C
@ -24,8 +24,6 @@
#include <config.h> #include <config.h>
#endif #endif
#include "getopt.h"
#if !defined __STDC__ || !__STDC__ #if !defined __STDC__ || !__STDC__
/* This is a separate conditional since some stdc systems /* This is a separate conditional since some stdc systems
reject `defined (const)'. */ reject `defined (const)'. */
@ -36,6 +34,8 @@
#include <stdio.h> #include <stdio.h>
#include "getopt.h"
/* Comment out all this code if we are using the GNU C Library, and are not /* 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 actually compiling the library itself. This code is part of the GNU C
Library, but also included in many other GNU distributions. Compiling Library, but also included in many other GNU distributions. Compiling

6
libiberty/getpwd.c
View File

@ -39,10 +39,6 @@ extern int errno;
#include <limits.h> #include <limits.h>
#endif #endif
/* Prototype these in case the system headers don't provide them. */
extern char *getpwd ();
extern char *getwd ();
#include "libiberty.h" #include "libiberty.h"
/* Virtually every UN*X system now in common use (except for pre-4.3-tahoe /* 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. */ the few exceptions to the general rule here. */
#if !defined(HAVE_GETCWD) && defined(HAVE_GETWD) #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) #define getcwd(buf,len) getwd(buf)
#endif #endif