summaryrefslogtreecommitdiff
path: root/lib-src/etags.c
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1995-05-27 00:26:00 +0000
committerKarl Heuer <kwzh@gnu.org>1995-05-27 00:26:00 +0000
commit241bfeacda5a4c70f5004347b85f6e5b1d31df15 (patch)
treeaf1161aade7ae1270c1e20535e2fc02dc13f516e /lib-src/etags.c
parentf92cc613ca9e13f1bd26d4a8634cdc3f0c9513d6 (diff)
downloademacs-241bfeacda5a4c70f5004347b85f6e5b1d31df15.tar.gz
(etags_getcwd): Don't use #elif.
Have just one function body.
Diffstat (limited to 'lib-src/etags.c')
-rw-r--r--lib-src/etags.c12
1 files changed, 5 insertions, 7 deletions
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