X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxgetcwd.c;h=7ab2204682587acdc16722c412912c88c7dbcef0;hb=0941f53a92efc360e019b76923d0ecd380849939;hp=6e775e74b26ffceb206981a1d6d8dc822dbe560f;hpb=d282959bf42afbdb856ec29cd1f0bc2883000f71;p=gnulib.git

diff --git a/lib/xgetcwd.c b/lib/xgetcwd.c
index 6e775e74b..7ab220468 100644
--- a/lib/xgetcwd.c
+++ b/lib/xgetcwd.c
@@ -1,5 +1,5 @@
 /* xgetcwd.c -- return current directory with unlimited length
-   Copyright (C) 1992 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1996 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,20 +12,13 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* Written by David MacKenzie, djm@gnu.ai.mit.edu. */
+/* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
-#include <config.h>
-#else
-#include "config.h"
-#endif
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 #include <stdio.h>
@@ -33,14 +26,15 @@
 #ifndef errno
 extern int errno;
 #endif
+
 #include <sys/types.h>
 #include "pathmax.h"
 
-#if !defined(_POSIX_VERSION) && !defined(HAVE_GETCWD)
-char *getwd ();
-#define getcwd(buf, max) getwd (buf)
-#else
+#if HAVE_GETCWD
 char *getcwd ();
+#else
+char *getwd ();
+# define getcwd(Buf, Max) getwd (Buf)
 #endif
 
 /* Amount to increase buffer size by in each try. */