pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/wine/patches __errno and ___errno overrides ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/626eaa3623fd
branches: trunk
changeset: 543934:626eaa3623fd
user: jmcneill <jmcneill%pkgsrc.org@localhost>
date: Fri Jun 27 11:47:24 2008 +0000
description:
__errno and ___errno overrides must exist, so #undef them rather than
not overriding at all on NetBSD.
diffstat:
emulators/wine/patches/patch-bb | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diffs (33 lines):
diff -r bd6e7bcb96b7 -r 626eaa3623fd emulators/wine/patches/patch-bb
--- a/emulators/wine/patches/patch-bb Fri Jun 27 02:54:08 2008 +0000
+++ b/emulators/wine/patches/patch-bb Fri Jun 27 11:47:24 2008 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index