diff options
| author | ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-04-02 11:07:45 +0000 |
|---|---|---|
| committer | ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-04-02 11:07:45 +0000 |
| commit | b7621d131c18cc55a048ae06cefc9d792c7e9565 (patch) | |
| tree | 4846aa29b1c899ca051b360843233a9cc438a53c | |
| parent | ba3dee74fa01a3ba1e5ef0b158527e410a26dca5 (diff) | |
| download | gcc-b7621d131c18cc55a048ae06cefc9d792c7e9565.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@18952 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/Makefile.in | 2 | ||||
| -rw-r--r-- | gcc/choose-temp.c | 16 | ||||
| -rw-r--r-- | libiberty/ChangeLog | 4 | ||||
| -rw-r--r-- | libiberty/choose-temp.c | 16 |
5 files changed, 33 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ac37ecd95b4..4095eeddba0 100644 --- 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 0e95429165c..34044b50d7f 100644 --- 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 5668f745207..ea4f9ed5f32 100644 --- 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 6e6321b7fa9..27a26eb9d1b 100644 --- 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 5668f745207..ea4f9ed5f32 100644 --- 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" |