summaryrefslogtreecommitdiff
path: root/emulators/wine
diff options
context:
space:
mode:
authorjmcneill <jmcneill@pkgsrc.org>2008-06-27 11:47:24 +0000
committerjmcneill <jmcneill@pkgsrc.org>2008-06-27 11:47:24 +0000
commit52919497c375563e52d4b1895489a5e3019331fc (patch)
tree015cd4fefc419e655a726b3a8249f7df06b95cde /emulators/wine
parent49f04b38c73de11c03ecf9018ed819e8480eb37b (diff)
downloadpkgsrc-52919497c375563e52d4b1895489a5e3019331fc.tar.gz
__errno and ___errno overrides must exist, so #undef them rather than
not overriding at all on NetBSD.
Diffstat (limited to 'emulators/wine')
-rw-r--r--emulators/wine/patches/patch-bb22
1 files changed, 12 insertions, 10 deletions
diff --git a/emulators/wine/patches/patch-bb b/emulators/wine/patches/patch-bb
index c56ab5bfeaa..d927ed7ae86 100644
--- a/emulators/wine/patches/patch-bb
+++ b/emulators/wine/patches/patch-bb
@@ -1,17 +1,19 @@
-$NetBSD: patch-bb,v 1.1 2008/06/26 19:46:56 jmcneill Exp $
+$NetBSD: patch-bb,v 1.2 2008/06/27 11:47:24 jmcneill Exp $
---- loader/kthread.c.orig 2008-06-26 15:40:21.000000000 -0400
-+++ loader/kthread.c 2008-06-26 15:40:35.000000000 -0400
-@@ -115,10 +115,12 @@
+--- loader/kthread.c.orig 2008-06-17 10:07:31.000000000 -0400
++++ loader/kthread.c 2008-06-27 07:32:03.000000000 -0400
+@@ -115,6 +115,14 @@
pthread_descr descr = __pthread_thread_self();
return &descr->thread_errno;
}
-+#ifndef __NetBSD__
++
++#ifdef __errno
++#undef __errno
++#endif
++#ifdef ___errno
++#undef ___errno
++#endif
++
int *__error(void) { return __errno_location(); } /* FreeBSD */
int *__errno(void) { return __errno_location(); } /* NetBSD */
int *___errno(void) { return __errno_location(); } /* Solaris */
- int *__thr_errno(void) { return __errno_location(); } /* UnixWare */
-+#endif
-
- /***********************************************************************
- * __h_errno_location