* filenames.h (HAS_DRIVE_SPEC, STRIP_DRIVE_SPEC): New macros.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158359 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/include/ChangeLog b/include/ChangeLog
index 2da6a1b..938b5ba 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-14  Doug Evans  <dje@google.com>
+
+       * filenames.h (HAS_DRIVE_SPEC, STRIP_DRIVE_SPEC): New macros.
+
 2010-04-13  Matthias Klose  <doko@ubuntu.com>
 
        * elf: Remove empty directory.

diff --git a/include/filenames.h b/include/filenames.h
index ca23d32..d5e34a0 100644 (file)
--- a/include/filenames.h
+++ b/include/filenames.h
@@ -31,44 +31,34 @@ extern "C" {
 #endif
 
 #if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__) || defined (__CYGWIN__)
-#  ifndef HAVE_DOS_BASED_FILE_SYSTEM
-#    define HAVE_DOS_BASED_FILE_SYSTEM 1
-#  endif
-#  define HAS_DRIVE_SPEC(f) HAS_DOS_DRIVE_SPEC (f)
-#  define IS_DIR_SEPARATOR(c) IS_DOS_DIR_SEPARATOR (c)
-#  define IS_ABSOLUTE_PATH(f) IS_DOS_ABSOLUTE_PATH (f)
-#else /* not DOSish */
-#  define HAS_DRIVE_SPEC(f) (0)
-#  define IS_DIR_SEPARATOR(c) IS_UNIX_DIR_SEPARATOR (c)
-#  define IS_ABSOLUTE_PATH(f) IS_UNIX_ABSOLUTE_PATH (f)
+
+#ifndef HAVE_DOS_BASED_FILE_SYSTEM
+#define HAVE_DOS_BASED_FILE_SYSTEM 1
 #endif
 
-#define IS_DIR_SEPARATOR_1(dos_based, c)                               \
-  (((c) == '/')                                                                \
-   || (((c) == '\\') && (dos_based)))
+#define IS_DIR_SEPARATOR(c)    ((c) == '/' || (c) == '\\')
 
-#define HAS_DRIVE_SPEC_1(dos_based, f)                 \
-  ((f)[0] && ((f)[1] == ':') && (dos_based))
+#define HAS_DRIVE_SPEC(f)      (((f)[0]) && ((f)[1] == ':'))
 
 /* Remove the drive spec from F, assuming HAS_DRIVE_SPEC (f).
    The result is a pointer to the remainder of F.  */
 #define STRIP_DRIVE_SPEC(f)    ((f) + 2)
 
-#define IS_DOS_DIR_SEPARATOR(c) IS_DIR_SEPARATOR_1 (1, c)
-#define IS_DOS_ABSOLUTE_PATH(f) IS_ABSOLUTE_PATH_1 (1, f)
-#define HAS_DOS_DRIVE_SPEC(f) HAS_DRIVE_SPEC_1 (1, f)
-
-#define IS_UNIX_DIR_SEPARATOR(c) IS_DIR_SEPARATOR_1 (0, c)
-#define IS_UNIX_ABSOLUTE_PATH(f) IS_ABSOLUTE_PATH_1 (0, f)
-
-/* Note that when DOS_BASED is true, IS_ABSOLUTE_PATH accepts d:foo as
-   well, although it is only semi-absolute.  This is because the users
-   of IS_ABSOLUTE_PATH want to know whether to prepend the current
-   working directory to a file name, which should not be done with a
-   name like d:foo.  */
-#define IS_ABSOLUTE_PATH_1(dos_based, f)                \
-  (IS_DIR_SEPARATOR_1 (dos_based, (f)[0])               \
-   || HAS_DRIVE_SPEC_1 (dos_based, f))
+/* Note that IS_ABSOLUTE_PATH accepts d:foo as well, although it is
+   only semi-absolute.  This is because the users of IS_ABSOLUTE_PATH
+   want to know whether to prepend the current working directory to
+   a file name, which should not be done with a name like d:foo.  */
+#define IS_ABSOLUTE_PATH(f)    (IS_DIR_SEPARATOR((f)[0]) || HAS_DRIVE_SPEC(f))
+
+#else  /* not DOSish */
+
+#define IS_DIR_SEPARATOR(c)    ((c) == '/')
+#define IS_ABSOLUTE_PATH(f)    (IS_DIR_SEPARATOR((f)[0]))
+
+#define HAS_DRIVE_SPEC(f)      (0)
+#define STRIP_DRIVE_SPEC(f)    (f)
+
+#endif /* not DOSish */
 
 extern int filename_cmp (const char *s1, const char *s2);
 #define FILENAME_CMP(s1, s2)   filename_cmp(s1, s2)