diff options
| author | DJ Delorie <dj@delorie.com> | 2002-06-18 03:01:43 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2002-06-18 03:01:43 +0000 |
| commit | cb8fd011cb39088390b1e161c19e7e2c5c24289b (patch) | |
| tree | 5f88f89db4d384d77e39fffb978c984fe8607aa5 /libiberty | |
| parent | abbd9a6d7cf8464d08410f78e039220b6db775c7 (diff) | |
| download | gdb-cb8fd011cb39088390b1e161c19e7e2c5c24289b.tar.gz | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/lbasename.c | 16 |
2 files changed, 9 insertions, 12 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 916995e5b12..06cb89f4b0e 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2002-06-17 Douglas Rupp <rupp@gnat.com> + + * lbasename.c: Add 2002 to copyright. + (IS_DIR_SEPARATOR): Remove VMS junk. + 2002-06-05 Geoffrey Keating <geoffk@redhat.com> * hashtab.c (htab_create): New stub function for backward diff --git a/libiberty/lbasename.c b/libiberty/lbasename.c index cea0253887b..43cb73f0a1d 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 * |