From 207ff633feae11eb0ddf171b49bcd5e93dfa05ab Mon Sep 17 00:00:00 2001 From: Craig Burley Date: Wed, 15 Jul 1998 03:07:55 -0400 Subject: [PATCH] Cleanups vis-a-vis system.h cutover and g77-0.5.24: Mon Jul 13 17:33:44 1998 Craig Burley 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: r21176 --- gcc/f/ChangeLog | 11 +++++++++++ gcc/f/Makefile.in | 2 +- gcc/f/ansify.c | 2 ++ gcc/f/fini.c | 1 - gcc/f/intdoc.c | 2 ++ gcc/f/proj.h | 5 +++++ 6 files changed, 21 insertions(+), 2 deletions(-) diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index 662235ebd82..5495bb96da8 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,14 @@ +Mon Jul 13 17:33:44 1998 Craig Burley + + 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. + Mon Jul 13 17:30:29 1998 Nick Clifton * lang-options.h: Format changed to work with --help support added diff --git a/gcc/f/Makefile.in b/gcc/f/Makefile.in index fff69b335c0..4f9733bd4eb 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 b1838c1caac..3af68e55483 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 +#endif typedef enum { diff --git a/gcc/f/fini.c b/gcc/f/fini.c index 44c749f3861..439eccad90b 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 648b75afb74..0ac39ff43ce 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 +#endif typedef enum { diff --git a/gcc/f/proj.h b/gcc/f/proj.h index e592d8bbb3b..93b12b330c8 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. is needed for assert(). is needed for offsetof, but technically also NULL, size_t, ptrdiff_t, and so on. */ + #include "assert.j" + +#if HAVE_STDDEF_H #include +#endif /* Generally useful definitions. */ + typedef enum { #if !defined(false) || !defined(true) -- 2.30.2