diff options
| author | Daniel Jacobowitz <drow@false.org> | 2003-12-22 19:22:57 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2003-12-22 19:22:57 +0000 |
| commit | 4fd47f10aea3693604a88496aa8e12356c89b50b (patch) | |
| tree | e98ff9d45a3182548e78b2f55a29c1e570d74fa7 | |
| parent | b6fb00c07bfde584d9359115ab6e0986627a21a0 (diff) | |
| download | gdb-4fd47f10aea3693604a88496aa8e12356c89b50b.zip gdb-4fd47f10aea3693604a88496aa8e12356c89b50b.tar.gz gdb-4fd47f10aea3693604a88496aa8e12356c89b50b.tar.bz2 | |
* Makefile.in (lbasename.o): Depend on filenames.h.
* lbasename.c: Include "filenames.h" instead of defining
its macros locally.
| -rw-r--r-- | libiberty/ChangeLog | 7 | ||||
| -rw-r--r-- | libiberty/Makefile.in | 2 | ||||
| -rw-r--r-- | libiberty/lbasename.c | 20 |
3 files changed, 9 insertions, 20 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index c1de8de..05a9b90 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,10 @@ +2003-12-22 Daniel Jacobowitz <drow@mvista.com> + + PR debug/13272 + * Makefile.in (lbasename.o): Depend on filenames.h. + * lbasename.c: Include "filenames.h" instead of defining + its macros locally. + 2003-12-22 Ian Lance Taylor <ian@wasabisystems.com> * cp-demangle.c (CP_DYNAMIC_ARRAYS): Define if compiler supports diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index 5fff39b..f3ff338 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -451,7 +451,7 @@ hashtab.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/hashtab.h \ hex.o: $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ $(INCDIR)/safe-ctype.h lbasename.o: $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ - $(INCDIR)/safe-ctype.h + $(INCDIR)/safe-ctype.h $(INCDIR)/filenames.h lrealpath.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h make-relative-prefix.o: config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h diff --git a/libiberty/lbasename.c b/libiberty/lbasename.c index 43cb73f..200a87f 100644 --- a/libiberty/lbasename.c +++ b/libiberty/lbasename.c @@ -40,25 +40,7 @@ and a path ending in @code{/} returns the empty string after it. #include "ansidecl.h" #include "libiberty.h" #include "safe-ctype.h" - -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -#endif - -#if defined (_WIN32) || defined (__MSDOS__) \ - || defined (__DJGPP__) || defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -#endif - -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif +#include "filenames.h" const char * lbasename (name) |