aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorRichard M. Stallman1994-11-01 05:26:14 +0000
committerRichard M. Stallman1994-11-01 05:26:14 +0000
commitc05b6df53469331da25741c3d753527c265d2c3d (patch)
tree81c65827a444e2b6e0d94b45dddcfffb91434523 /lib-src
parent86b0513a2cc57df26af9aa756384a13704abc924 (diff)
downloademacs-c05b6df53469331da25741c3d753527c265d2c3d.tar.gz
emacs-c05b6df53469331da25741c3d753527c265d2c3d.zip
(main, etags_getcwd): Test DOS_NT instead of MSDOS.
[WINDOWSNT]: Include some NT headers.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/etags.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 4db10b343e5..8a87f4a2f4d 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -35,6 +35,13 @@ char pot_etags_version[] = "@(#) pot revision number is 10.32";
35#include <sys/param.h> 35#include <sys/param.h>
36#endif /* MSDOS */ 36#endif /* MSDOS */
37 37
38#ifdef WINDOWSNT
39#include <stdlib.h>
40#include <fcntl.h>
41#include <string.h>
42#define MAXPATHLEN _MAX_PATH
43#endif
44
38#ifdef HAVE_CONFIG_H 45#ifdef HAVE_CONFIG_H
39#include <../src/config.h> 46#include <../src/config.h>
40/* On some systems, Emacs defines static as nothing 47/* On some systems, Emacs defines static as nothing
@@ -410,9 +417,9 @@ main (argc, argv)
410 extern char *massage_name (); 417 extern char *massage_name ();
411#endif 418#endif
412 419
413#ifdef MSDOS 420#ifdef DOS_NT
414 _fmode = O_BINARY; /* all of files are treated as binary files */ 421 _fmode = O_BINARY; /* all of files are treated as binary files */
415#endif /* MSDOS */ 422#endif /* DOS_NT */
416 423
417 progname = argv[0]; 424 progname = argv[0];
418 425
@@ -3171,7 +3178,7 @@ concat (s1, s2, s3)
3171 return result; 3178 return result;
3172} 3179}
3173 3180
3174#ifdef MSDOS 3181#ifdef DOS_NT
3175char * 3182char *
3176etags_getcwd () 3183etags_getcwd ()
3177{ 3184{
@@ -3185,7 +3192,7 @@ etags_getcwd ()
3185 *p++ = tolower (*p); 3192 *p++ = tolower (*p);
3186 return strdup (cwd); 3193 return strdup (cwd);
3187} 3194}
3188#else /* not MSDOS */ 3195#else /* not DOS_NT */
3189/* Does the same work as the system V getcwd, but does not need to 3196/* Does the same work as the system V getcwd, but does not need to
3190 guess buffer size in advance. Included mostly for compatibility. */ 3197 guess buffer size in advance. Included mostly for compatibility. */
3191char * 3198char *
@@ -3228,7 +3235,7 @@ etags_getcwd ()
3228 buf[strlen (buf) - 1] = '\0'; 3235 buf[strlen (buf) - 1] = '\0';
3229 return buf; 3236 return buf;
3230} 3237}
3231#endif /* not MSDOS */ 3238#endif /* not DOS_NT */
3232 3239
3233/* Return a newly allocated string containing the filename 3240/* Return a newly allocated string containing the filename
3234 of FILE relative to the absolute directory DIR (which 3241 of FILE relative to the absolute directory DIR (which