From: Arnaud Charlet <charlet@adacore.com>
Date: Sat, 25 Jan 2020 10:00:20 +0000 (-0500)
Subject: [Ada] Avoid redefining IS_DIR_SEPARATOR macro
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=354cce532c1923601f5eadf25557efe62870e88e;p=gcc.git

[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.
---

diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index a4992000c01..c44d1932332 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);