procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix etags builds on non-Windows non-MS-DOS machines

Browse source 
* lib-src/etags.c: In this file, MSDOS is always defined but can be
either `true` or `false`, so don't used `defined MSDOS` as a condition.
This commit is contained in:
Mattias Engdegård 2022-12-06 17:37:22 +01:00
parent 7e6d1d1c47
commit 43b7e7efbf
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib-src/etags.c
View file

@ -401,7 +401,7 @@ static void invalidate_nodes (fdesc *, node **);
static void put_entries (node *); static void put_entries (node *);
static void cleanup_tags_file (char const * const, char const * const); static void cleanup_tags_file (char const * const, char const * const);
#if !defined (MSDOS) && !defined (DOS_NT) #if !MSDOS && !defined (DOS_NT)
static char *escape_shell_arg_string (char *); static char *escape_shell_arg_string (char *);
#endif #endif
static void do_move_file (const char *, const char *); static void do_move_file (const char *, const char *);
@ -1416,7 +1416,7 @@ main (int argc, char **argv)
setenv ("LC_COLLATE", "C", 1); setenv ("LC_COLLATE", "C", 1);
setenv ("LC_ALL", "C", 1); */ setenv ("LC_ALL", "C", 1); */
char *cmd = xmalloc (8 * strlen (tagfile) + sizeof "sort -u -o '' ''"); char *cmd = xmalloc (8 * strlen (tagfile) + sizeof "sort -u -o '' ''");
#if defined WINDOWSNT || defined MSDOS #if defined WINDOWSNT || MSDOS
/* Quote "like this". No need to escape the quotes in the file name, /* Quote "like this". No need to escape the quotes in the file name,
since it is not allowed in file names on these systems. */ since it is not allowed in file names on these systems. */
char *z = stpcpy (cmd, "sort -u -o \""); char *z = stpcpy (cmd, "sort -u -o \"");
@ -7720,7 +7720,7 @@ etags_mktmp (void)
return templt; return templt;
} }
#if !defined (MSDOS) && !defined (DOS_NT) #if !MSDOS && !defined (DOS_NT)
/* /*
* Adds single quotes around a string, if found single quotes, escaped it. * Adds single quotes around a string, if found single quotes, escaped it.
* Return a newly-allocated string. * Return a newly-allocated string.