Patched in the gcc directory:

        * Makefile.in (choose-temp.o): Depend on system.h.
Patched in both the libiberty and gcc directories:
        * choose-temp.c: Include system.h when IN_GCC.

From-SVN: r18952

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ac37ecd..4095eed 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr  2 13:51:10 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * Makefile.in (choose-temp.o): Depend on system.h.
+
+        * choose-temp.c: Include system.h when IN_GCC.
+
 Thu Apr  2 02:37:07 1998  Joern Rennecke  (amylaar@cygnus.co.uk)
                          Richard Henderson  <rth@cygnus.com>
 

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 0e95429..34044b5 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1311,7 +1311,7 @@ dumpvers: dumpvers.c
 
 version.o: version.c
 obstack.o: obstack.c $(CONFIG_H)
-choose-temp.o: choose-temp.c $(CONFIG_H) gansidecl.h
+choose-temp.o: choose-temp.c $(CONFIG_H) gansidecl.h system.h
 pexecute.o: pexecute.c $(CONFIG_H) system.h gansidecl.h
 prefix.o: prefix.c $(CONFIG_H) system.h gansidecl.h Makefile
        $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \

diff --git a/gcc/choose-temp.c b/gcc/choose-temp.c
index 5668f74..ea4f9ed 100644 (file)
--- a/gcc/choose-temp.c
+++ b/gcc/choose-temp.c
@@ -26,12 +26,17 @@ Boston, MA 02111-1307, USA.  */
 #include "config.h"
 #endif
 
-/* If we are in gcc, or we have a config.h, we assume that
-   HAVE_SYS_FILE_H tells us whether to include sys/file.h.  However,
-   libiberty does not have a config.h, and instead arranges to define
-   NO_SYS_FILE_H on the command line when there is no sys/file.h.  */
+#ifdef IN_GCC
+#include "system.h"
+#else
+
+/* If we are in gcc, system.h has handled everything.  When not in
+   gcc, if we have a config.h we assume that HAVE_SYS_FILE_H tells us
+   whether to include sys/file.h.  However, libiberty does not have a
+   config.h, and instead arranges to define NO_SYS_FILE_H on the
+   command line when there is no sys/file.h.  */
 
-#if (defined (IN_GCC) || defined (HAVE_CONFIG_H)) ? defined (HAVE_SYS_FILE_H) : ! defined (NO_SYS_FILE_H)
+#if defined (HAVE_CONFIG_H) ? defined (HAVE_SYS_FILE_H) : ! defined (NO_SYS_FILE_H)
 #include <sys/types.h>
 #include <sys/file.h>   /* May get R_OK, etc. on some systems.  */
 #endif
@@ -43,6 +48,7 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #include <stdio.h>     /* May get P_tmpdir.  */
+#endif /* IN_GCC */
 
 #ifdef IN_GCC
 #include "gansidecl.h"

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 6e6321b..27a26eb 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr  2 13:53:54 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * choose-temp.c: Include system.h when IN_GCC.
+
 1998-04-01  Mark Mitchell  <mmitchell@usa.net>
 
        * cplus-dem.c (optable): Add sizeof.

diff --git a/libiberty/choose-temp.c b/libiberty/choose-temp.c
index 5668f74..ea4f9ed 100644 (file)
--- a/libiberty/choose-temp.c
+++ b/libiberty/choose-temp.c
@@ -26,12 +26,17 @@ Boston, MA 02111-1307, USA.  */
 #include "config.h"
 #endif
 
-/* If we are in gcc, or we have a config.h, we assume that
-   HAVE_SYS_FILE_H tells us whether to include sys/file.h.  However,
-   libiberty does not have a config.h, and instead arranges to define
-   NO_SYS_FILE_H on the command line when there is no sys/file.h.  */
+#ifdef IN_GCC
+#include "system.h"
+#else
+
+/* If we are in gcc, system.h has handled everything.  When not in
+   gcc, if we have a config.h we assume that HAVE_SYS_FILE_H tells us
+   whether to include sys/file.h.  However, libiberty does not have a
+   config.h, and instead arranges to define NO_SYS_FILE_H on the
+   command line when there is no sys/file.h.  */
 
-#if (defined (IN_GCC) || defined (HAVE_CONFIG_H)) ? defined (HAVE_SYS_FILE_H) : ! defined (NO_SYS_FILE_H)
+#if defined (HAVE_CONFIG_H) ? defined (HAVE_SYS_FILE_H) : ! defined (NO_SYS_FILE_H)
 #include <sys/types.h>
 #include <sys/file.h>   /* May get R_OK, etc. on some systems.  */
 #endif
@@ -43,6 +48,7 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #include <stdio.h>     /* May get P_tmpdir.  */
+#endif /* IN_GCC */
 
 #ifdef IN_GCC
 #include "gansidecl.h"