diff options
| author | Arnaud Charlet <charlet@adacore.com> | 2020-01-25 05:00:20 -0500 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2020-06-04 05:11:09 -0400 |
| commit | 354cce532c1923601f5eadf25557efe62870e88e (patch) | |
| tree | 73498f4c9da1f4aa0409f4c7a735acd1b90e7751 /gcc | |
| parent | c21938bee0d0a5cb3da442d3d4500d2eeb416b44 (diff) | |
| download | gcc-354cce532c1923601f5eadf25557efe62870e88e.zip gcc-354cce532c1923601f5eadf25557efe62870e88e.tar.gz gcc-354cce532c1923601f5eadf25557efe62870e88e.tar.bz2 | |
[Ada] Avoid redefining IS_DIR_SEPARATOR macro
2020-06-04 Arnaud Charlet <charlet@adacore.com>
gcc/ada/
* adaint.c: Avoid redefining IS_DIR_SEPARATOR macro.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/adaint.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index a499200..c44d193 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -264,9 +264,9 @@ UINT __gnat_current_ccs_encoding; #ifndef DIR_SEPARATOR #define DIR_SEPARATOR '/' -#define IS_DIR_SEPARATOR(c) ((c) == DIR_SEPARATOR) +#define IS_DIRECTORY_SEPARATOR(c) ((c) == DIR_SEPARATOR) #else -#define IS_DIR_SEPARATOR(c) ((c) == '/' || (c) == DIR_SEPARATOR) +#define IS_DIRECTORY_SEPARATOR(c) ((c) == '/' || (c) == DIR_SEPARATOR) #endif /* Check for cross-compilation. */ @@ -1712,10 +1712,10 @@ __gnat_is_absolute_path (char *name, int length) return 0; #else return (length != 0) && - (IS_DIR_SEPARATOR(*name) + (IS_DIRECTORY_SEPARATOR(*name) #if defined (WINNT) || defined(__DJGPP__) || (length > 2 && ISALPHA (name[0]) && name[1] == ':' - && IS_DIR_SEPARATOR(name[2])) + && IS_DIRECTORY_SEPARATOR(name[2])) #endif ); #endif @@ -2849,7 +2849,7 @@ __gnat_locate_file_with_predicate (char *file_name, char *path_val, /* If file_name include directory separator(s), try it first as a path name relative to the current directory */ - for (ptr = file_name; *ptr && !IS_DIR_SEPARATOR(*ptr); ptr++) + for (ptr = file_name; *ptr && !IS_DIRECTORY_SEPARATOR(*ptr); ptr++) ; if (*ptr != 0) @@ -2890,7 +2890,7 @@ __gnat_locate_file_with_predicate (char *file_name, char *path_val, if (*ptr == '"') ptr--; - if (!IS_DIR_SEPARATOR(*ptr)) + if (!IS_DIRECTORY_SEPARATOR(*ptr)) *++ptr = DIR_SEPARATOR; strcpy (++ptr, file_name); |