diff options
| author | Daniel Jacobowitz <dan@debian.org> | 2003-12-22 19:22:57 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <dan@debian.org> | 2003-12-22 19:22:57 +0000 |
| commit | 92248cee68d967bb56f1179b32bbb7c73fc79b3c (patch) | |
| tree | 517c12f2c9f0be4df75ed48205c9326becf2c7de | |
| parent | c3436656e12956862ab07e20632178d5f3c2f37f (diff) | |
| download | gdb-92248cee68d967bb56f1179b32bbb7c73fc79b3c.tar.gz | |
* 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 c1de8dec495..05a9b9066ce 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 5fff39be8b8..f3ff338fa2d 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 43cb73f0a1d..200a87f2387 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) |