diff options
| author | Jakob Schlyter <jakob@cvs.openbsd.org> | 2005-03-22 16:52:41 +0000 |
|---|---|---|
| committer | Jakob Schlyter <jakob@cvs.openbsd.org> | 2005-03-22 16:52:41 +0000 |
| commit | aa143c5d97c7073734423303e4c620db67d3e778 (patch) | |
| tree | 66071754b6f7957bf77609e5c3dfb2e20a48e36a /usr.sbin/bind/lib/isc/pthreads | |
| parent | 85f94e9dbf9ef0e23e9d1ef58ccb87bcdc40a53b (diff) | |
resolve conflicts
Diffstat (limited to 'usr.sbin/bind/lib/isc/pthreads')
| -rw-r--r-- | usr.sbin/bind/lib/isc/pthreads/thread.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/usr.sbin/bind/lib/isc/pthreads/thread.c b/usr.sbin/bind/lib/isc/pthreads/thread.c index fa34c43334c..459e65a9dfe 100644 --- a/usr.sbin/bind/lib/isc/pthreads/thread.c +++ b/usr.sbin/bind/lib/isc/pthreads/thread.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $ISC: thread.c,v 1.9.2.2.2.1 2004/03/06 08:14:54 marka Exp $ */ +/* $ISC: thread.c,v 1.9.2.2.2.2 2004/12/04 06:50:03 marka Exp $ */ #include <config.h> @@ -49,6 +49,12 @@ isc_thread_create(isc_threadfunc_t func, isc_threadarg_t arg, } #endif +#if defined(PTHREAD_SCOPE_SYSTEM) && defined(NEED_PTHREAD_SCOPE_SYSTEM) + ret = pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM); + if (ret != 0) + return (ISC_R_UNEXPECTED); +#endif + ret = pthread_create(thread, &attr, func, arg); if (ret != 0) return (ISC_R_UNEXPECTED); |