From: Richard Henderson Date: Tue, 31 Aug 1999 20:33:13 +0000 (-0700) Subject: * getpwd.c: Check HAVE_GETCWD before defining it away. X-Git-Tag: prereleases/libstdc++-2.92~10916 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4dfeccf9d064821bede6f09da2949499f19c68c4;p=thirdparty%2Fgcc.git * getpwd.c: Check HAVE_GETCWD before defining it away. From-SVN: r29013 --- diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 2f02a0f608e1..dd1afbd79ff7 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +1999-08-31 Richard Henderson + + * getpwd.c: Check HAVE_GETCWD before defining it away. + 1999-08-30 Kaveh R. Ghazi * Makefile.in (CFILES): Add calloc.c and getpwd.c. diff --git a/libiberty/getpwd.c b/libiberty/getpwd.c index 2fa341681e34..de6e03976483 100644 --- a/libiberty/getpwd.c +++ b/libiberty/getpwd.c @@ -34,17 +34,15 @@ extern char *getwd (); BSD systems) now provides getcwd as called for by POSIX. Allow for the few exceptions to the general rule here. */ -#if !(defined (POSIX) || defined (USG) || defined (VMS)) || defined (HAVE_GETWD) +#if !defined(HAVE_GETCWD) && defined(HAVE_GETWD) #define getcwd(buf,len) getwd(buf) +#endif + #ifdef MAXPATHLEN #define GUESSPATHLEN (MAXPATHLEN + 1) #else #define GUESSPATHLEN 100 #endif -#else /* (defined (USG) || defined (VMS)) */ -/* We actually use this as a starting point, not a limit. */ -#define GUESSPATHLEN 100 -#endif /* (defined (USG) || defined (VMS)) */ #if !(defined (VMS) || (defined(_WIN32) && !defined(__CYGWIN__)))