From 4c64aaf6a411e5426f6a9e0b464118179ab60ef1 Mon Sep 17 00:00:00 2001
From: Richard Stallman <rms@gnu.org>
Date: Sun, 24 May 1992 06:33:48 +0000
Subject: [PATCH] *** empty log message ***

From-SVN: r1072
---
 gcc/cccp.c | 9 ++-------
 gcc/gcc.c  | 1 +
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/gcc/cccp.c b/gcc/cccp.c
index 4487af180fa..f0ce06ffacb 100644
--- a/gcc/cccp.c
+++ b/gcc/cccp.c
@@ -1477,7 +1477,7 @@ main (argc, argv)
       char *startp, *endp;
 
       for (num_dirs = 1, startp = epath; *startp; startp++)
-	if (*startp == ':')
+	if (*startp == PATH_SEPARATOR)
 	  num_dirs++;
       include_defaults
 	= (struct default_include *) xmalloc ((num_dirs
@@ -1861,12 +1861,7 @@ path_include (path)
       struct file_name_list *dirtmp;
 
       /* Find the end of this name.  */
-#ifdef __MSDOS__
-      /* Handle cases like c:/usr/lib:d:/gcc/lib */
-      while (*q != 0 && (*q != ':' || (q - p == 1 && isalpha (*p)))) q++;
-#else
-      while (*q != 0 && *q != ':') q++;
-#endif
+      while (*q != 0 && *q != PATH_SEPARATOR) q++;
       if (p == q) {
 	/* An empty name in the path stands for the current directory.  */
 	name = (char *) xmalloc (2);
diff --git a/gcc/gcc.c b/gcc/gcc.c
index a7a2e41a93f..866d75e7b3a 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -35,6 +35,7 @@ compilation is specified by a string called a "spec".  */
 #include <ctype.h>
 #include <signal.h>
 #include <sys/stat.h>
+#include <sys/file.h>   /* May get R_OK, etc. on some systems.  */
 
 #include "config.h"
 #include "obstack.h"
-- 
2.30.2