merge from gcc

This commit is contained in:
DJ Delorie
2002-06-18 03:01:43 +00:00
parent 2a24298d33
commit f9c3326aec
2 changed files with 9 additions and 12 deletions

View File

@ -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> 2002-06-05 Geoffrey Keating <geoffk@redhat.com>
* hashtab.c (htab_create): New stub function for backward * hashtab.c (htab_create): New stub function for backward

View File

@ -1,6 +1,6 @@
/* Libiberty basename. Like basename, but is not overridden by the /* Libiberty basename. Like basename, but is not overridden by the
system C library. 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. This file is part of the libiberty library.
Libiberty is free software; you can redistribute it and/or 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
#endif #endif
/* Define IS_DIR_SEPARATOR. VMS uses '::', ':', '[...]' and '<...>' to #ifndef DIR_SEPARATOR_2
separate the different components of a file specification. It's a # define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
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) == '>')
#else #else
# ifndef DIR_SEPARATOR_2 # define IS_DIR_SEPARATOR(ch) \
# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
# else
# define IS_DIR_SEPARATOR(ch) \
(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
# endif
#endif #endif
const char * const char *