From: Karl Heuer <kwzh@gnu.org>
Date: Sat, 27 May 1995 00:26:00 +0000 (+0000)
Subject: (etags_getcwd): Don't use #elif.
X-Git-Tag: emacs-19.34~3901
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=153e4de00035f4da8d78f7a2f609435c67bd2e81;p=emacs.git

(etags_getcwd): Don't use #elif.
Have just one function body.
---

diff --git a/lib-src/etags.c b/lib-src/etags.c
index faf1c8654c3..f83a64658e0 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -3661,8 +3661,8 @@ concat (s1, s2, s3)
    guess buffer size in advance. */
 char *
 etags_getcwd ()
-#ifdef DOS_NT
 {
+#ifdef DOS_NT
   char *p, path[MAXPATHLEN + 1]; /* Fixed size is safe on MSDOS.  */
 
   getwd (path);
@@ -3674,9 +3674,8 @@ etags_getcwd ()
       *p++ = tolower (*p);
 
   return strdup (path);
-}
-#elif HAVE_GETCWD /* not DOS_NT */
-{
+#else /* not DOS_NT */
+#if HAVE_GETCWD
   int bufsize = 200;
   char *path = xnew (bufsize, char);
 
@@ -3689,9 +3688,7 @@ etags_getcwd ()
     }
 
   return path;
-}
 #else /* not DOS_NT and not HAVE_GETCWD */
-{
   struct linebuffer path;
   FILE *pipe;
 
@@ -3702,8 +3699,9 @@ etags_getcwd ()
   pclose (pipe);
 
   return path.buffer;
+#endif /* not HAVE_GETCWD */
+#endif /* not DOS_NT */
 }
-#endif /* not DOS_NT and not HAVE_GETCWD */
 
 /* Return a newly allocated string containing the filename
    of FILE relative to the absolute directory DIR (which