diff options
| author | Mattias EngdegÄrd | 2022-12-06 17:37:22 +0100 |
|---|---|---|
| committer | Mattias EngdegÄrd | 2022-12-06 17:37:22 +0100 |
| commit | 43b7e7efbf4df178bb3fa42a32e90ee34de84d46 (patch) | |
| tree | 649fb450c2b187c33a87b48a2f9d2f9b7155a063 /lib-src | |
| parent | 7e6d1d1c47196bf1bb5254f5c9014e25bdaf9833 (diff) | |
| download | emacs-43b7e7efbf4df178bb3fa42a32e90ee34de84d46.tar.gz emacs-43b7e7efbf4df178bb3fa42a32e90ee34de84d46.zip | |
Fix etags builds on non-Windows non-MS-DOS machines
* 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.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/etags.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib-src/etags.c b/lib-src/etags.c index 9091257a203..b76590631d8 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c | |||
| @@ -401,7 +401,7 @@ static void invalidate_nodes (fdesc *, node **); | |||
| 401 | static void put_entries (node *); | 401 | static void put_entries (node *); |
| 402 | static void cleanup_tags_file (char const * const, char const * const); | 402 | static void cleanup_tags_file (char const * const, char const * const); |
| 403 | 403 | ||
| 404 | #if !defined (MSDOS) && !defined (DOS_NT) | 404 | #if !MSDOS && !defined (DOS_NT) |
| 405 | static char *escape_shell_arg_string (char *); | 405 | static char *escape_shell_arg_string (char *); |
| 406 | #endif | 406 | #endif |
| 407 | static void do_move_file (const char *, const char *); | 407 | static void do_move_file (const char *, const char *); |
| @@ -1416,7 +1416,7 @@ main (int argc, char **argv) | |||
| 1416 | setenv ("LC_COLLATE", "C", 1); | 1416 | setenv ("LC_COLLATE", "C", 1); |
| 1417 | setenv ("LC_ALL", "C", 1); */ | 1417 | setenv ("LC_ALL", "C", 1); */ |
| 1418 | char *cmd = xmalloc (8 * strlen (tagfile) + sizeof "sort -u -o '' ''"); | 1418 | char *cmd = xmalloc (8 * strlen (tagfile) + sizeof "sort -u -o '' ''"); |
| 1419 | #if defined WINDOWSNT || defined MSDOS | 1419 | #if defined WINDOWSNT || MSDOS |
| 1420 | /* Quote "like this". No need to escape the quotes in the file name, | 1420 | /* Quote "like this". No need to escape the quotes in the file name, |
| 1421 | since it is not allowed in file names on these systems. */ | 1421 | since it is not allowed in file names on these systems. */ |
| 1422 | char *z = stpcpy (cmd, "sort -u -o \""); | 1422 | char *z = stpcpy (cmd, "sort -u -o \""); |
| @@ -7720,7 +7720,7 @@ etags_mktmp (void) | |||
| 7720 | return templt; | 7720 | return templt; |
| 7721 | } | 7721 | } |
| 7722 | 7722 | ||
| 7723 | #if !defined (MSDOS) && !defined (DOS_NT) | 7723 | #if !MSDOS && !defined (DOS_NT) |
| 7724 | /* | 7724 | /* |
| 7725 | * Adds single quotes around a string, if found single quotes, escaped it. | 7725 | * Adds single quotes around a string, if found single quotes, escaped it. |
| 7726 | * Return a newly-allocated string. | 7726 | * Return a newly-allocated string. |