Remove NEED_PTHREAD_SCOPE_SYSTEM define that was needed on older FreeBSDs

diff --git a/acconfig.h b/acconfig.h
index 28fd2841d6d11db96ad2bf127f40fe836cfca8c5..e87336e48b57b8d6cfd3b0242f624b4f0551f6de 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -17,8 +17,5 @@
  ***/
 @TOP@
 
-/* Define if threads need PTHREAD_SCOPE_SYSTEM */
-#undef NEED_PTHREAD_SCOPE_SYSTEM
-
 /* Define to 1 if you have the uname library function. */
 #undef HAVE_UNAME

diff --git a/config.h.in b/config.h.in
index 12c116f4926b4bb850a60fbd0db93c49b69f3993..b6dc6d6a5a94ffaab7b36368637d6d98f4ece408 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -17,9 +17,6 @@
  *** it does not get installed.
  ***/
 
-/* Define if threads need PTHREAD_SCOPE_SYSTEM */
-#undef NEED_PTHREAD_SCOPE_SYSTEM
-
 /* Define to 1 if you have the uname library function. */
 #undef HAVE_UNAME
 

diff --git a/configure b/configure
index 1657f57faa3d64ff198c4c248fd7fe202494cb3d..4dbc0c81c62f841bdd93e902d6f3ae06ef708d0c 100755 (executable)
--- a/configure
+++ b/configure
@@ -15216,25 +15216,6 @@ fi
 done
 
 
-#
-# Additional OS-specific issues related to pthreads.
-#
-case "$host" in
-       *-freebsd*)
-               case $host in
-               *-freebsd5.[012]|*-freebsd5.[012].*);;
-               *-freebsd5.[3456789]|*-freebsd5.[3456789].*)
-                       $as_echo "#define NEED_PTHREAD_SCOPE_SYSTEM 1" >>confdefs.h
-
-                       ;;
-               *-freebsd6.*)
-                       $as_echo "#define NEED_PTHREAD_SCOPE_SYSTEM 1" >>confdefs.h
-
-                       ;;
-               esac
-               ;;
-esac
-
 # Look for functions relating to thread naming
 for ac_func in pthread_setname_np pthread_set_name_np
 do :

diff --git a/configure.in b/configure.in
index a627195e0a0982f9fc18b9ee1571312f508b651f..e4654d5807194380325a6857d53628281cff5047 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -701,23 +701,6 @@ AC_CHECK_HEADERS([sched.h])
 AC_SEARCH_LIBS([sched_yield],[rt])
 AC_CHECK_FUNCS([sched_yield pthread_yield pthread_yield_np])
 
-#
-# Additional OS-specific issues related to pthreads.
-#
-case "$host" in
-       *-freebsd*)
-               case $host in
-               *-freebsd5.[[012]]|*-freebsd5.[[012]].*);;
-               *-freebsd5.[[3456789]]|*-freebsd5.[[3456789]].*)
-                       AC_DEFINE(NEED_PTHREAD_SCOPE_SYSTEM)
-                       ;;
-               *-freebsd6.*)
-                       AC_DEFINE(NEED_PTHREAD_SCOPE_SYSTEM)
-                       ;;
-               esac
-               ;;
-esac
-
 # Look for functions relating to thread naming
 AC_CHECK_FUNCS([pthread_setname_np pthread_set_name_np])
 AC_CHECK_HEADERS([pthread_np.h], [], [], [#include <pthread.h>])

diff --git a/lib/isc/pthreads/thread.c b/lib/isc/pthreads/thread.c
index 5f82475ed5121fb94733c2080f05152a3c92f64e..ba7ae52daae42a3f65d927cd7a3cbc4dd3fe0008 100644 (file)
--- a/lib/isc/pthreads/thread.c
+++ b/lib/isc/pthreads/thread.c
@@ -51,12 +51,6 @@ 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);