aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <rth@cygnus.com>1999-08-31 13:33:13 -0700
committerRichard Henderson <rth@gcc.gnu.org>1999-08-31 13:33:13 -0700
commit4dfeccf9d064821bede6f09da2949499f19c68c4 (patch)
tree53dc9f4ec215c66e8a42eb62a0f5661cda975858
parent8fd8d061f7f7bbcc33472c9cd94dffd671fdd531 (diff)
downloadgcc-4dfeccf9d064821bede6f09da2949499f19c68c4.zip
gcc-4dfeccf9d064821bede6f09da2949499f19c68c4.tar.gz
gcc-4dfeccf9d064821bede6f09da2949499f19c68c4.tar.bz2
* getpwd.c: Check HAVE_GETCWD before defining it away.
From-SVN: r29013
-rw-r--r--libiberty/ChangeLog4
-rw-r--r--libiberty/getpwd.c8
2 files changed, 7 insertions, 5 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 2f02a0f..dd1afbd 100644
--- 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 2fa3416..de6e039 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__)))