summaryrefslogtreecommitdiff
path: root/libiberty/lbasename.c
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2002-06-18 03:01:43 +0000
committerDJ Delorie <dj@delorie.com>2002-06-18 03:01:43 +0000
commitb6c3a97043e3866a65cc970bcd476f8466a927c1 (patch)
tree084a09effd87cbac0ef407b102e31dc6952a27c2 /libiberty/lbasename.c
parentcad5f1d60333dc9596d156ca350299ce3600b517 (diff)
downloadbinutils-redhat-b6c3a97043e3866a65cc970bcd476f8466a927c1.tar.gz
merge from gcc
Diffstat (limited to 'libiberty/lbasename.c')
-rw-r--r--libiberty/lbasename.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/libiberty/lbasename.c b/libiberty/lbasename.c
index cea0253887..43cb73f0a1 100644
--- a/libiberty/lbasename.c
+++ b/libiberty/lbasename.c
@@ -1,6 +1,6 @@
/* Libiberty basename. Like basename, but is not overridden by the
system C library.
- Copyright (C) 2001 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002 Free Software Foundation, Inc.
This file is part of the libiberty library.
Libiberty is free software; you can redistribute it and/or
@@ -53,19 +53,11 @@ and a path ending in @code{/} returns the empty string after it.
# endif
#endif
-/* Define IS_DIR_SEPARATOR. VMS uses '::', ':', '[...]' and '<...>' to
- separate the different components of a file specification. It's a
- bit of a stretch to call ':', ']' and '>' directory separators, so
- just define the test to find the file name component. */
-#ifdef VMS
-# define IS_DIR_SEPARATOR(ch) ((ch) == ':' || (ch) == ']' || (ch) == '>')
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
#else
-# ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-# else
-# define IS_DIR_SEPARATOR(ch) \
+# define IS_DIR_SEPARATOR(ch) \
(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-# endif
#endif
const char *