diff options
| author | Karl Heuer | 1995-05-27 00:26:00 +0000 |
|---|---|---|
| committer | Karl Heuer | 1995-05-27 00:26:00 +0000 |
| commit | 153e4de00035f4da8d78f7a2f609435c67bd2e81 (patch) | |
| tree | 9cf4487b7ce52b9f799b522fd70f1943a6d4b523 /lib-src | |
| parent | 5e228a39252a130c77eecea3cd29372faa7985ed (diff) | |
| download | emacs-153e4de00035f4da8d78f7a2f609435c67bd2e81.tar.gz emacs-153e4de00035f4da8d78f7a2f609435c67bd2e81.zip | |
(etags_getcwd): Don't use #elif.
Have just one function body.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/etags.c | 12 |
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) | |||
| 3661 | guess buffer size in advance. */ | 3661 | guess buffer size in advance. */ |
| 3662 | char * | 3662 | char * |
| 3663 | etags_getcwd () | 3663 | etags_getcwd () |
| 3664 | #ifdef DOS_NT | ||
| 3665 | { | 3664 | { |
| 3665 | #ifdef DOS_NT | ||
| 3666 | char *p, path[MAXPATHLEN + 1]; /* Fixed size is safe on MSDOS. */ | 3666 | char *p, path[MAXPATHLEN + 1]; /* Fixed size is safe on MSDOS. */ |
| 3667 | 3667 | ||
| 3668 | getwd (path); | 3668 | getwd (path); |
| @@ -3674,9 +3674,8 @@ etags_getcwd () | |||
| 3674 | *p++ = tolower (*p); | 3674 | *p++ = tolower (*p); |
| 3675 | 3675 | ||
| 3676 | return strdup (path); | 3676 | return strdup (path); |
| 3677 | } | 3677 | #else /* not DOS_NT */ |
| 3678 | #elif HAVE_GETCWD /* not DOS_NT */ | 3678 | #if HAVE_GETCWD |
| 3679 | { | ||
| 3680 | int bufsize = 200; | 3679 | int bufsize = 200; |
| 3681 | char *path = xnew (bufsize, char); | 3680 | char *path = xnew (bufsize, char); |
| 3682 | 3681 | ||
| @@ -3689,9 +3688,7 @@ etags_getcwd () | |||
| 3689 | } | 3688 | } |
| 3690 | 3689 | ||
| 3691 | return path; | 3690 | return path; |
| 3692 | } | ||
| 3693 | #else /* not DOS_NT and not HAVE_GETCWD */ | 3691 | #else /* not DOS_NT and not HAVE_GETCWD */ |
| 3694 | { | ||
| 3695 | struct linebuffer path; | 3692 | struct linebuffer path; |
| 3696 | FILE *pipe; | 3693 | FILE *pipe; |
| 3697 | 3694 | ||
| @@ -3702,8 +3699,9 @@ etags_getcwd () | |||
| 3702 | pclose (pipe); | 3699 | pclose (pipe); |
| 3703 | 3700 | ||
| 3704 | return path.buffer; | 3701 | return path.buffer; |
| 3702 | #endif /* not HAVE_GETCWD */ | ||
| 3703 | #endif /* not DOS_NT */ | ||
| 3705 | } | 3704 | } |
| 3706 | #endif /* not DOS_NT and not HAVE_GETCWD */ | ||
| 3707 | 3705 | ||
| 3708 | /* Return a newly allocated string containing the filename | 3706 | /* Return a newly allocated string containing the filename |
| 3709 | of FILE relative to the absolute directory DIR (which | 3707 | of FILE relative to the absolute directory DIR (which |