diff --git a/configure b/configure index 9bc078286f..b0b98e796c 100755 --- a/configure +++ b/configure @@ -18454,20 +18454,6 @@ rm -f core conftest.err conftest.$ac_objext \ #) #fi -# for FreeBSD thr_self -for ac_header in sys/thr.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/thr.h" "ac_cv_header_sys_thr_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_thr_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_THR_H 1 -_ACEOF - -fi - -done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler sync operations" >&5 $as_echo_n "checking for compiler sync operations... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/configure.ac b/configure.ac index a3563e97a9..0e1a11eeda 100644 --- a/configure.ac +++ b/configure.ac @@ -1172,9 +1172,6 @@ AC_LINK_IFELSE( #) #fi -# for FreeBSD thr_self -AC_CHECK_HEADERS([sys/thr.h]) - AC_MSG_CHECKING(for compiler sync operations) AC_LINK_IFELSE( [AC_LANG_PROGRAM([], [int foo1; int foo2 = __sync_fetch_and_add(&foo1, 1);])], diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 7a3c5831bd..f656f0b868 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -1156,9 +1156,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_THR_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TIME_H diff --git a/main/utils.c b/main/utils.c index 58ba1914f8..b4d79867c9 100644 --- a/main/utils.c +++ b/main/utils.c @@ -36,10 +36,10 @@ #include #if defined(__APPLE__) #include +#elif defined(__FreeBSD__) +#include #elif defined(__NetBSD__) #include -#elif defined(HAVE_SYS_THR_H) -#include #endif #include "asterisk/network.h" @@ -2757,9 +2757,9 @@ int ast_get_tid(void) #elif defined(__APPLE__) ret = mach_thread_self(); mach_port_deallocate(mach_task_self(), ret); -#elif defined(__FreeBSD__) && defined(HAVE_SYS_THR_H) +#elif defined(__FreeBSD__) long lwpid; - thr_self(&lwpid); /* available since sys/thr.h creation 2003 */ + thr_self(&lwpid); ret = lwpid; #elif defined(__NetBSD__) ret = _lwp_self();