diff options
| author | rillig <rillig@pkgsrc.org> | 2005-03-11 21:18:15 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-03-11 21:18:15 +0000 |
| commit | 0d1d63fe2e07754596e8333d25c9f3ee041c9998 (patch) | |
| tree | bcae3133409677a28e8b58522ce867ef15f637a3 /emulators | |
| parent | edb7f8d06370fe44fe0dc2ffe0f18cd7dd2a287c (diff) | |
| download | pkgsrc-0d1d63fe2e07754596e8333d25c9f3ee041c9998.tar.gz | |
NetBSD-1.6.2 does not have <sys/ucontext.h>. So only use it for
NetBSD>=2.0. Approved by wiz.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/wine/distinfo | 4 | ||||
| -rw-r--r-- | emulators/wine/patches/patch-af | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index f314559c0de..bc8ad687697 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2005/02/23 18:49:22 agc Exp $ +$NetBSD: distinfo,v 1.30 2005/03/11 21:18:15 rillig Exp $ SHA1 (Wine-20050211.tar.gz) = 6c1b7397d653e5a053e03923db55dfd8209a2566 RMD160 (Wine-20050211.tar.gz) = 06ce19f57d8235cd280f956d53c77bea0ace4c50 @@ -8,4 +8,4 @@ SHA1 (patch-ab) = 7feb8eaad0005ea3b501967ca070a4b397d707c2 SHA1 (patch-ac) = 8c909b1683185e0ac12f2be6024e26da40addf1c SHA1 (patch-ad) = 92abc177dc37ed983ec6079cd08ad7a1472e178a SHA1 (patch-ae) = a18b1c01d61d26fbe1a82dca82ea0d76df0c8bcd -SHA1 (patch-af) = c2bb6dd2b208b5d176f6303d62b2f00aec8897a5 +SHA1 (patch-af) = 72a5d77dc4dc2d67e87e90603f4f00e6b6ed5851 diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af index a6a0b99e45a..f96ce031c60 100644 --- a/emulators/wine/patches/patch-af +++ b/emulators/wine/patches/patch-af @@ -1,13 +1,13 @@ -$NetBSD: patch-af,v 1.10 2005/02/16 12:22:11 adam Exp $ +$NetBSD: patch-af,v 1.11 2005/03/11 21:18:15 rillig Exp $ ---- dlls/ntdll/signal_i386.c.orig 2005-02-16 10:30:28.000000000 +0000 -+++ dlls/ntdll/signal_i386.c +--- dlls/ntdll/signal_i386.c.orig Thu Dec 2 19:19:25 2004 ++++ dlls/ntdll/signal_i386.c Fri Feb 25 01:31:18 2005 @@ -206,7 +206,7 @@ typedef struct trapframe SIGCONTEXT; #endif /* bsdi */ -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) ++#if (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) || defined(__OpenBSD__) typedef struct sigcontext SIGCONTEXT; @@ -16,7 +16,7 @@ $NetBSD: patch-af,v 1.10 2005/02/16 12:22:11 adam Exp $ #endif /* __APPLE__ */ -#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) ||\ -+#if defined(__NetBSD__) ++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000) +# include <sys/ucontext.h> +# include <sys/types.h> +# include <signal.h> @@ -49,7 +49,7 @@ $NetBSD: patch-af,v 1.10 2005/02/16 12:22:11 adam Exp $ +#endif /* NetBSD */ + + -+#if defined(linux) || defined(__FreeBSD__) ||\ ++#if defined(linux) || (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) ||\ defined(__OpenBSD__) || defined(__EMX__) || defined(__CYGWIN__) #define EAX_sig(context) ((context)->sc_eax) |