2000-01-06 Mumit Khan <khan@xraylith.wisc.edu>

	* cccp.c: Delete PATH_SEPARATOR, DIR_SEPARATOR and
	IS_DIR_SEPARATOR macros.
	* collect2.c: Likewise.
	* cppinit.c: Likewise.
	* dwarf2out.c: Likewise.
	* gcc.c: Likewise.
	* gcov.c: Likewise.
	* prefix.c: Likewise.
	* rtl.c: Likewise.
	* toplev.c: Likewise.
	* system.h: And move to here.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@31264 138bc75d-0d04-0410-961f-82ee72b054a4

11 files changed, 29 insertions, 76 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a8cb181e385..37b72cfc7af 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,17 @@
 2000-01-06  Mumit Khan  <khan@xraylith.wisc.edu>
 
+	* cccp.c: Delete PATH_SEPARATOR, DIR_SEPARATOR and
+	IS_DIR_SEPARATOR macros.
+	* collect2.c: Likewise.
+	* cppinit.c: Likewise.
+	* dwarf2out.c: Likewise.
+	* gcc.c: Likewise.
+	* gcov.c: Likewise.
+	* prefix.c: Likewise.
+	* rtl.c: Likewise.
+	* toplev.c: Likewise.
+	* system.h: And move to here.
+
 	* prefix.c (update_path): Fix typo in variable name.
 
 2000-01-06  Richard Henderson  <rth@cygnus.com>
diff --git a/gcc/cccp.c b/gcc/cccp.c
index e1320613a8f..0ee216a2c34 100644
--- a/gcc/cccp.c
+++ b/gcc/cccp.c
@@ -46,16 +46,6 @@ typedef unsigned char U_CHAR;
 # define STANDARD_INCLUDE_DIR "/usr/include"
 #endif
 
-/* By default, colon separates directories in a path.  */
-#ifndef PATH_SEPARATOR
-# define PATH_SEPARATOR ':'
-#endif
-
-/* By default, a slash separates directory names.  */
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-#endif
-
 /* By default, the suffix for object files is ".o".  */
 #ifdef OBJECT_SUFFIX
 # define HAVE_OBJECT_SUFFIX
diff --git a/gcc/collect2.c b/gcc/collect2.c
index 18d7fb85a1e..bfab130b407 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -49,18 +49,6 @@ Boston, MA 02111-1307, USA.  */
 #include "obstack.h"
 #include "intl.h"
 
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define IS_DIR_SEPARATOR(ch) ((ch) == '/')
-#else /* DIR_SEPARATOR */
-# ifndef DIR_SEPARATOR_2
-#  define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-# else /* DIR_SEPARATOR && DIR_SEPARATOR_2 */
-#  define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-# endif /* DIR_SEPARATOR && DIR_SEPARATOR_2 */
-#endif /* DIR_SEPARATOR */
-
 /* Obstack allocation and deallocation routines.  */
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
@@ -648,11 +636,6 @@ is_ctor_dtor (s)
   return 0;
 }
 
-/* By default, colon separates directories in a path.  */
-#ifndef PATH_SEPARATOR
-#define PATH_SEPARATOR ':'
-#endif
-
 /* We maintain two prefix lists: one from COMPILER_PATH environment variable
    and one from the PATH variable.  */
 
diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index 2bec8450901..b5c5d3a0c68 100644
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -37,11 +37,6 @@ extern char *version_string;
 #define GET_ENV_PATH_LIST(VAR,NAME)	do { (VAR) = getenv (NAME); } while (0)
 #endif
 
-/* By default, colon separates directories in a path.  */
-#ifndef PATH_SEPARATOR
-#define PATH_SEPARATOR ':'
-#endif
-
 #ifndef STANDARD_INCLUDE_DIR
 #define STANDARD_INCLUDE_DIR "/usr/include"
 #endif
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index f4fae3341a0..ca01b193db9 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -65,10 +65,6 @@ Boston, MA 02111-1307, USA.  */
 # define assert(e) do { if (! (e)) abort (); } while (0)
 #endif
 
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
 /* Decide whether we want to emit frame unwind information for the current
    translation unit.  */
 
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 15064ebf66f..d488b4a35ae 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -65,15 +65,6 @@ extern int getrusage PROTO ((int, struct rusage *));
 #define OBJECT_SUFFIX ".o"
 #endif
 
-/* By default, colon separates directories in a path.  */
-#ifndef PATH_SEPARATOR
-#define PATH_SEPARATOR ':'
-#endif
-
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
 #ifndef VMS
 /* FIXME: the location independence code for VMS is hairier than this,
    and hasn't been written.  */
@@ -82,14 +73,6 @@ extern int getrusage PROTO ((int, struct rusage *));
 #endif /* DIR_UP */
 #endif /* VMS */
 
-/* Define IS_DIR_SEPARATOR.  */
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
 static char dir_separator_str[] = {DIR_SEPARATOR, 0};
 
 #define obstack_chunk_alloc xmalloc
diff --git a/gcc/gcov.c b/gcc/gcov.c
index 46e0c435c33..5dbd4a468ea 100644
--- a/gcc/gcov.c
+++ b/gcc/gcov.c
@@ -281,10 +281,6 @@ fnotice VPROTO ((FILE *file, const char *msgid, ...))
   va_end (ap);
 }
 
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
 /* More 'friendly' abort that prints the line and file.
    config.h can #define abort fancy_abort if you like that sort of thing.  */
 extern void fancy_abort PROTO ((void)) ATTRIBUTE_NORETURN;
diff --git a/gcc/prefix.c b/gcc/prefix.c
index 687d559949c..9d7bd612b0a 100644
--- a/gcc/prefix.c
+++ b/gcc/prefix.c
@@ -82,17 +82,6 @@ static char *lookup_key		PROTO((char *));
 static HKEY reg_key = (HKEY) INVALID_HANDLE_VALUE;
 #endif
 
-#ifndef DIR_SEPARATOR
-# define IS_DIR_SEPARATOR(ch) ((ch) == '/')
-#else /* DIR_SEPARATOR */
-# ifndef DIR_SEPARATOR_2
-#  define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-# else /* DIR_SEPARATOR && DIR_SEPARATOR_2 */
-#  define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-# endif /* DIR_SEPARATOR && DIR_SEPARATOR_2 */
-#endif /* DIR_SEPARATOR */
-
 /* Given KEY, as above, return its value.  */
 
 static const char *
diff --git a/gcc/rtl.c b/gcc/rtl.c
index 554b9535b56..ad6c52d2321 100644
--- a/gcc/rtl.c
+++ b/gcc/rtl.c
@@ -32,10 +32,6 @@ Boston, MA 02111-1307, USA.  */
 #define	obstack_chunk_alloc	xmalloc
 #define	obstack_chunk_free	free
 
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
 /* Obstack used for allocating RTL objects.
    Between functions, this is the permanent_obstack.
    While parsing and expanding a function, this is maybepermanent_obstack
diff --git a/gcc/system.h b/gcc/system.h
index b3f89e39f71..431b32fa2ca 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -528,6 +528,23 @@ extern void abort PARAMS ((void));
 # endif
 #endif /* ! HOST_PTR_PRINTF */
 
+/* By default, colon separates directories in a path.  */
+#ifndef PATH_SEPARATOR
+#define PATH_SEPARATOR ':'
+#endif
+
+#ifndef DIR_SEPARATOR
+#define DIR_SEPARATOR '/'
+#endif
+
+/* Define IS_DIR_SEPARATOR.  */
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
 /* Get libiberty declarations. */
 #include "libiberty.h"
 
diff --git a/gcc/toplev.c b/gcc/toplev.c
index c70482a2e5f..c3f975bd406 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -137,10 +137,6 @@ You Lose!  You must define PREFERRED_DEBUGGING_TYPE!
 #define PREFERRED_DEBUGGING_TYPE NO_DEBUG
 #endif
 
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
 #if ! (defined (VMS) || defined (OS2))
 extern char **environ;
 #endif