mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-19 12:20:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Ada] Avoid redefining IS_DIR_SEPARATOR macro

Browse Source 
2020-06-04  Arnaud Charlet  <charlet@adacore.com>

gcc/ada/

	* adaint.c: Avoid redefining IS_DIR_SEPARATOR macro.
This commit is contained in:
Arnaud Charlet 2020-01-25 05:00:20 -05:00 committed by Pierre-Marie de Rodat
parent c21938bee0
commit 354cce532c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/ada/adaint.c
View File

@ -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);