From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 2 Dec 2002 15:48:26 +0000 (+0000)
Subject: (main): Test HAVE_GETCWD, not BSD_SYSTEM.
X-Git-Tag: emacs-pretest-21.2.93~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5c80c0092004c750e3761b1afe6da48061e55971;p=emacs.git

(main): Test HAVE_GETCWD, not BSD_SYSTEM.
---

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 988bfc4fd4d..65438de5fba 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -399,19 +399,19 @@ main (argc, argv)
       fail (argc, argv);
     }
 
-#ifdef BSD_SYSTEM
-  cwd = getwd (string);
-#else
+#ifdef HAVE_GETCWD
   cwd = getcwd (string, sizeof string);
+#else
+  cwd = getwd (string);
 #endif
   if (cwd == 0)
     {
       /* getwd puts message in STRING if it fails.  */
       fprintf (stderr, "%s: %s (%s)\n", argv[0],
-#ifdef BSD_SYSTEM
-	       string,
-#else
+#ifdef HAVE_GETCWD
 	       "Cannot get current working directory",
+#else
+	       string,
 #endif
 	       strerror (errno));
       fail (argc, argv);