Let machine/ansi.h know not to play glibc for us.

This commit is contained in:
David E. O'Brien 2002-03-24 11:44:40 +00:00
parent d9e0ff8265
commit a49ca2d5bb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=56531
3 changed files with 24 additions and 7 deletions

View file

@ -1,11 +1,12 @@
--- ginclude/stddef.h.orig Mon Oct 28 04:35:28 1996 --- ginclude/stddef.h.orig Mon Oct 28 04:35:28 1996
+++ ginclude/stddef.h Tue Aug 11 13:26:05 1998 +++ ginclude/stddef.h Sun Mar 24 03:26:25 2002
@@ -24,7 +24,7 @@ @@ -24,7 +24,8 @@
/* On 4.3bsd-net2, make sure ansi.h is included, so we have /* On 4.3bsd-net2, make sure ansi.h is included, so we have
one less case to deal with in the following. */ one less case to deal with in the following. */
-#if defined (__BSD_NET2__) || defined (____386BSD____) || defined (__FreeBSD__) || defined(__NetBSD__) -#if defined (__BSD_NET2__) || defined (____386BSD____) || defined (__FreeBSD__) || defined(__NetBSD__)
+#if defined (__BSD_NET2__) || defined (____386BSD____) || defined (__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__) +#if defined (__BSD_NET2__) || defined (____386BSD____) || defined (__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__)
+#define __NO_GNUC_VA_LIST
#include <machine/ansi.h> #include <machine/ansi.h>
#endif #endif

View file

@ -0,0 +1,8 @@
--- sys-types.h.orig Wed Oct 9 04:26:35 1996
+++ sys-types.h Sun Mar 24 03:35:27 2002
@@ -83,4 +83,5 @@
union wait;
+#define __NO_GNUC_VA_LIST /* <machine/ansi.h> defines __gnuc_va_list */
/* Get size_t and wchar_t. */
#include <stddef.h>

View file

@ -1,6 +1,14 @@
--- gcc/ginclude/stddef.h.orig Wed Dec 16 13:19:25 1998 --- gcc/ginclude/stddef.h.orig.orig Sun Mar 24 03:12:41 2002
+++ gcc/ginclude/stddef.h Tue Jun 22 11:05:25 1999 +++ gcc/ginclude/stddef.h Sun Mar 24 03:12:47 2002
@@ -109,7 +109,6 @@ @@ -25,6 +25,7 @@
/* On 4.3bsd-net2, make sure ansi.h is included, so we have
one less case to deal with in the following. */
#if defined (__BSD_NET2__) || defined (____386BSD____) || defined (__FreeBSD__) || defined(__NetBSD__)
+#define __NO_GNUC_VA_LIST
#include <machine/ansi.h>
#endif
@@ -109,7 +110,6 @@
#define _T_PTRDIFF #define _T_PTRDIFF
#define __PTRDIFF_T #define __PTRDIFF_T
#define _PTRDIFF_T_ #define _PTRDIFF_T_
@ -8,7 +16,7 @@
#define ___int_ptrdiff_t_h #define ___int_ptrdiff_t_h
#define _GCC_PTRDIFF_T #define _GCC_PTRDIFF_T
#ifndef __PTRDIFF_TYPE__ #ifndef __PTRDIFF_TYPE__
@@ -156,7 +155,6 @@ @@ -156,7 +156,6 @@
#define _T_SIZE #define _T_SIZE
#define __SIZE_T #define __SIZE_T
#define _SIZE_T_ #define _SIZE_T_
@ -16,7 +24,7 @@
#define _SIZE_T_DEFINED_ #define _SIZE_T_DEFINED_
#define _SIZE_T_DEFINED #define _SIZE_T_DEFINED
#define ___int_size_t_h #define ___int_size_t_h
@@ -217,7 +215,6 @@ @@ -217,7 +216,6 @@
#define _T_WCHAR #define _T_WCHAR
#define __WCHAR_T #define __WCHAR_T
#define _WCHAR_T_ #define _WCHAR_T_