summaryrefslogtreecommitdiff
path: root/lang/gcc34/patches/patch-at
diff options
context:
space:
mode:
Diffstat (limited to 'lang/gcc34/patches/patch-at')
-rw-r--r--lang/gcc34/patches/patch-at31
1 files changed, 24 insertions, 7 deletions
diff --git a/lang/gcc34/patches/patch-at b/lang/gcc34/patches/patch-at
index f4d72aec34c..1808688e19b 100644
--- a/lang/gcc34/patches/patch-at
+++ b/lang/gcc34/patches/patch-at
@@ -1,24 +1,41 @@
-$NetBSD: patch-at,v 1.1 2009/03/30 10:57:02 markd Exp $
+$NetBSD: patch-at,v 1.2 2009/04/22 18:59:54 hasso Exp $
Alternative fix for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38182
---- gcc/ginclude/stddef.h.orig 2009-02-28 18:57:06.000000000 +0100
-+++ gcc/ginclude/stddef.h
-@@ -64,7 +64,7 @@ Boston, MA 02111-1307, USA. */
+--- gcc/ginclude/stddef.h.orig 2004-08-12 03:34:33 +0300
++++ gcc/ginclude/stddef.h 2009-04-09 12:05:04 +0300
+@@ -61,10 +61,15 @@ Boston, MA 02111-1307, USA. */
+ #include <sys/_types.h>
+ #endif
+
++#if defined (__DragonFly__)
++#include <machine/stdint.h>
++#include <sys/types.h>
++#endif
++
/* In 4.3bsd-net2, machine/ansi.h defines these symbols, which are
defined if the corresponding type is *not* defined.
FreeBSD-2.1 defines _MACHINE_ANSI_H_ instead of _ANSI_H_ */
-#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_)
-+#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) || defined(__NetBSD__)
++#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) || defined(__NetBSD__) || defined(__DragonFly__)
#if !defined(_SIZE_T_) && !defined(_BSD_SIZE_T_)
#define _SIZE_T
#endif
-@@ -359,7 +359,7 @@ typedef __WINT_TYPE__ wint_t;
+@@ -201,7 +205,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #define ___int_size_t_h
+ #define _GCC_SIZE_T
+ #define _SIZET_
+-#if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
++#if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) || defined(__DragonFly__)
+ /* __size_t is a typedef on FreeBSD 5!, must not trash it. */
+ #else
+ #define __size_t
+@@ -359,7 +363,7 @@ 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 and FreeBSD [23].x require the MACHINE_ANSI_H check here. */
-#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_)
-+#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) || defined(__NetBSD__)
++#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) || defined(__NetBSD__) || defined(__DragonFly__)
/* 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_