* getpwd.c: Check HAVE_GETCWD before defining it away.

From-SVN: r29013

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 2f02a0f608e12f576872c044055608336e077c51..dd1afbd79ff7f7954ba081d2598dd179a29a36c1 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+1999-08-31  Richard Henderson  <rth@cygnus.com>
+
+       * getpwd.c: Check HAVE_GETCWD before defining it away.
+
 1999-08-30  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * Makefile.in (CFILES): Add calloc.c and getpwd.c.

diff --git a/libiberty/getpwd.c b/libiberty/getpwd.c
index 2fa341681e3486745b168083c398dd8c6a0833ec..de6e03976483fcb86ac3f5c9cff86245cdb246d4 100644 (file)
--- 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__)))