t-freebsd: Do not override USER_H.

        * config/t-freebsd: Do not override USER_H.
        * ginclude/stddef.h: Generalize check for _MACHINE_ANSI_H_.

From-SVN: r30017

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index abc3e1c..edd7840 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 15 03:01:01 1999  Loren Rittle  <ljrittle@acm.org>
+
+       * config/t-freebsd: Do not override USER_H.
+       * ginclude/stddef.h: Generalize check for _MACHINE_ANSI_H_.
+
 Fri Oct 15 02:37:28 1999  Alastair J. Houghton <ajh8@doc.ic.ac.uk>
                          Mumit Khan  <khan@xraylith.wisc.edu>
 

diff --git a/gcc/config/t-freebsd b/gcc/config/t-freebsd
index 9981686..d284b3e 100644 (file)
--- a/gcc/config/t-freebsd
+++ b/gcc/config/t-freebsd
@@ -1,4 +1,2 @@
 # Don't run fixproto
 STMP_FIXPROTO =
-# Use only native include files
-USER_H = $(EXTRA_HEADERS) $(LANG_EXTRA_HEADERS)

diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h
index 00f2feb..0004ec7 100644 (file)
--- a/gcc/ginclude/stddef.h
+++ b/gcc/ginclude/stddef.h
@@ -313,9 +313,8 @@ typedef __WINT_TYPE__ wint_t;
 
 /*  In 4.3bsd-net2, leave these undefined to indicate that size_t, etc.
     are already defined.  */
-/*  BSD/OS 3.1 requires the MACHINE_ANSI_H check here.  FreeBSD 2.x apparently
-    does not, even though there is a check for MACHINE_ANSI_H above.  */
-#if defined(_ANSI_H_) || (defined(__bsdi__) && defined(_MACHINE_ANSI_H_))
+/*  BSD/OS 3.1 and FreeBSD [23].x require the MACHINE_ANSI_H check here.  */
+#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_)
 /*  The references to _GCC_PTRDIFF_T_, _GCC_SIZE_T_, and _GCC_WCHAR_T_
     are probably typos and should be removed before 2.8 is released.  */
 #ifdef _GCC_PTRDIFF_T_
@@ -343,7 +342,7 @@ typedef __WINT_TYPE__ wint_t;
 #undef _WCHAR_T_
 #undef _BSD_WCHAR_T_
 #endif
-#endif /* _ANSI_H_ || ( __bsdi__ && _MACHINE_ANSI_H_ ) */
+#endif /* _ANSI_H_ || _MACHINE_ANSI_H_ */
 
 #endif /* __sys_stdtypes_h */