*** empty log message ***

From-SVN: r1072

diff --git a/gcc/cccp.c b/gcc/cccp.c
index 4487af180faf0f8b78143041d59f99c6473659cb..f0ce06ffacb31e6105a84b6e52e0149622ec4364 100644 (file)
--- 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 a7a2e41a93fda1a39f82764db872428a9418d4fd..866d75e7b3a2e24c369fe74c3b3f5c9b5204c6bb 100644 (file)
--- 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"