diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-03 04:24:01 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-03 04:24:01 +0000 |
| commit | a5c088d4e31bf3257217d2f368dca57c18e9d98e (patch) | |
| tree | 37ea22037f920e97ce155abc8dd8f4290af8dba6 /gcc/java/jcf-path.c | |
| parent | eeaf6b144edb90ff6ff95822bab05f1470afb521 (diff) | |
| download | gcc-a5c088d4e31bf3257217d2f368dca57c18e9d98e.tar.gz | |
* system.h: Include filenames.h.
(IS_DIR_SEPARATOR, IS_ABSOLUTE_PATHNAME): Don't define.
(DIR_SEPARATOR, DIR_SEPARATOR_2): If not already defined,
define based on HAVE_DOS_BASED_FILE_SYSTEM.
* config/i386/xm-cygwin.h, config/i386/xm-djgpp.h
* config/i386/xm-mingw32.h: Don't define
HAVE_DOS_BASED_FILE_SYSTEM,
DIR_SEPARATOR, or DIR_SEPARATOR_2.
* doc/hostconfig.texi: Update to match.
* cppfiles.c, gcc.c, gensupport.c, protoize.c,
config/i386/cygwin.h:
Use IS_ABSOLUTE_PATH throughout.
* gcc.c (DIR_UP): Delete, unused.
* protoize.c (IS_SAME_PATH): Define in terms of
FILENAME_CMP.
(is_abspath): Delete.
java:
* jcf-path.c: Don't default-define PATH_SEPARATOR nor
DIR_SEPARATOR.
Use FILENAME_CMP.
* jcf-write.c: Don't default-define DIR_SEPARATOR.
* jcf.h: Delete COMPARE_FILENAMES definition.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68863 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java/jcf-path.c')
| -rw-r--r-- | gcc/java/jcf-path.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/gcc/java/jcf-path.c b/gcc/java/jcf-path.c index 8771e6fd879..eae44c0b130 100644 --- a/gcc/java/jcf-path.c +++ b/gcc/java/jcf-path.c @@ -34,15 +34,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "jcf.h" -/* By default, colon separates directories in a path. */ -#ifndef PATH_SEPARATOR -#define PATH_SEPARATOR ':' -#endif - -#ifndef DIR_SEPARATOR -#define DIR_SEPARATOR '/' -#endif - #ifndef DIR_UP #define DIR_UP ".." #endif @@ -147,15 +138,15 @@ add_entry (struct entry **entp, const char *filename, int is_system) len = strlen (filename); - if (len > 4 && (COMPARE_FILENAMES (filename + len - 4, ".zip") == 0 - || COMPARE_FILENAMES (filename + len - 4, ".jar") == 0)) + if (len > 4 && (FILENAME_CMP (filename + len - 4, ".zip") == 0 + || FILENAME_CMP (filename + len - 4, ".jar") == 0)) { n->flags |= FLAG_ZIP; /* If the user uses -classpath then he'll have to include libgcj.jar in the value. We check for this in a simplistic way. Symlinks will fool this test. This is only used for -MM and -MMD, so it probably isn't terribly important. */ - if (! COMPARE_FILENAMES (filename, LIBGCJ_ZIP_FILE)) + if (! FILENAME_CMP (filename, LIBGCJ_ZIP_FILE)) n->flags |= FLAG_SYSTEM; } |