From: Craig Burley <burley@gnu.org>
Date: Wed, 15 Jul 1998 09:35:58 +0000 (+0000)
Subject: Cleanups vis-a-vis system.h cutover and g77-0.5.24:
X-Git-Tag: prereleases/egcs-1.1-prerelease~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=885f2d73c0a1ea9253b6895fea3bd6b22e07224f;p=thirdparty%2Fgcc.git

Cleanups vis-a-vis system.h cutover and g77-0.5.24:

Mon Jul 13 17:33:44 1998  Craig Burley  <burley@gnu.org>
	Cleanups vis-a-vis system.h cutover and g77-0.5.24:
	* Makefile.in (fini.o): Define USE_HCONFIG macro
	so source code doesn't have to.
	* fini.c: Don't define USE_HCONFIG here, since
	source code usually shouldn't care about this.
	* ansify.c: Include stddef.h only if we have it.
	* intdoc.c: Ditto.
	* proj.h: Ditto.

From-SVN: r21181
---

diff --git a/gcc/f/Makefile.in b/gcc/f/Makefile.in
index fff69b335c0b..4f9733bd4eba 100644
--- a/gcc/f/Makefile.in
+++ b/gcc/f/Makefile.in
@@ -461,7 +461,7 @@ fini: fini.o proj-h.o
 	$(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o fini fini.o proj-h.o
 
 fini.o:
-	$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \
+	$(HOST_CC) -c -DUSE_HCONFIG $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \
 	      `echo $(srcdir)/fini.c | sed 's,^\./,,'` -o $@
 
 proj-h.o: proj.o
diff --git a/gcc/f/ansify.c b/gcc/f/ansify.c
index b1838c1caac1..3af68e55483d 100644
--- a/gcc/f/ansify.c
+++ b/gcc/f/ansify.c
@@ -25,7 +25,9 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "hconfig.j"
 #include "system.j"
 #include "assert.j"
+#if HAVE_STDDEF_H
 #include <stddef.h>
+#endif
 
 typedef enum
   {
diff --git a/gcc/f/fini.c b/gcc/f/fini.c
index 44c749f38610..439eccad90b8 100644
--- a/gcc/f/fini.c
+++ b/gcc/f/fini.c
@@ -19,7 +19,6 @@ along with GNU Fortran; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
-#define USE_HCONFIG
 #include "proj.h"
 #include "malloc.h"
 
diff --git a/gcc/f/intdoc.c b/gcc/f/intdoc.c
index 648b75afb74e..0ac39ff43ce8 100644
--- a/gcc/f/intdoc.c
+++ b/gcc/f/intdoc.c
@@ -25,7 +25,9 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "hconfig.j"
 #include "system.j"
 #include "assert.j"
+#if HAVE_STDDEF_H
 #include <stddef.h>
+#endif
 
 typedef enum
   {
diff --git a/gcc/f/proj.h b/gcc/f/proj.h
index e592d8bbb3be..93b12b330c89 100644
--- a/gcc/f/proj.h
+++ b/gcc/f/proj.h
@@ -46,10 +46,15 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 /* Include files everyone gets.  <assert.h> is needed for assert().
    <stddef.h> is needed for offsetof, but technically also NULL,
    size_t, ptrdiff_t, and so on.  */
+
 #include "assert.j"
+
+#if HAVE_STDDEF_H
 #include <stddef.h>
+#endif
 
 /* Generally useful definitions. */
+
 typedef enum
   {
 #if !defined(false) || !defined(true)