From 0890a89c373470e672fe2ffa46f50d0a083807fb Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 12 Oct 2010 10:26:31 +0000 Subject: [PATCH] ITS#6669 remove obsolete SunOS4 LWP support --- configure.in | 18 ------------------ include/ldap_int_thread.h | 25 ------------------------- include/portable.hin | 6 ------ libraries/libldap_r/Makefile.in | 4 ++-- 4 files changed, 2 insertions(+), 51 deletions(-) diff --git a/configure.in b/configure.in index 56c3f7701d..8979649d12 100644 --- a/configure.in +++ b/configure.in @@ -1711,23 +1711,6 @@ case $ol_with_threads in auto | yes | lwp) ) fi fi - - dnl check for SunOS4 LWP - AC_CHECK_HEADERS(lwp/lwp.h) - if test $ac_cv_header_lwp_lwp_h = yes ; then - AC_CHECK_LIB(lwp, lwp_create, [have_lwp=yes], [have_lwp=no]) - - if test $have_lwp = yes ; then - AC_DEFINE(HAVE_LWP,1, - [if you have SunOS LWP package]) - LTHREAD_LIBS="$LTHREAD_LIBS -llwp" - ol_link_threads=lwp - - if test $ol_with_yielding_select = auto ; then - ol_with_yielding_select=no - fi - fi - fi ;; esac @@ -1747,7 +1730,6 @@ if test $ol_with_threads = manual ; then OL_HEADER_LINUX_THREADS AC_CHECK_HEADERS(mach/cthreads.h) - AC_CHECK_HEADERS(lwp/lwp.h) AC_CHECK_HEADERS(thread.h synch.h) fi diff --git a/include/ldap_int_thread.h b/include/ldap_int_thread.h index 759c951e22..d2430f31ac 100644 --- a/include/ldap_int_thread.h +++ b/include/ldap_int_thread.h @@ -145,31 +145,6 @@ typedef thread_key_t ldap_int_thread_key_t; LDAP_END_DECL -#elif defined( HAVE_LWP ) -/************************************* - * * - * thread definitions for SunOS LWP * - * * - *************************************/ - -#include -#include -#define LDAP_THREAD_HAVE_SLEEP 1 - -LDAP_BEGIN_DECL - -typedef thread_t ldap_int_thread_t; -typedef mon_t ldap_int_thread_mutex_t; -struct ldap_int_thread_lwp_cv { - int lcv_created; - cv_t lcv_cv; -}; -typedef struct ldap_int_thread_lwp_cv ldap_int_thread_cond_t; - -#define HAVE_REENTRANT_FUNCTIONS 1 - -LDAP_END_DECL - #elif defined(HAVE_NT_THREADS) /************************************* * * diff --git a/include/portable.hin b/include/portable.hin index 900de8a261..97d8941817 100644 --- a/include/portable.hin +++ b/include/portable.hin @@ -331,12 +331,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LTDL_H -/* if you have SunOS LWP package */ -#undef HAVE_LWP - -/* Define to 1 if you have the header file. */ -#undef HAVE_LWP_LWP_H - /* define if you have Mach Cthreads */ #undef HAVE_MACH_CTHREADS diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in index 3d4f1db602..7093221557 100644 --- a/libraries/libldap_r/Makefile.in +++ b/libraries/libldap_r/Makefile.in @@ -32,10 +32,10 @@ XXSRCS = apitest.c test.c \ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ assertion.c deref.c ldifutil.c SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \ - thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \ + thr_posix.c thr_cthreads.c thr_thr.c thr_nt.c \ thr_pth.c thr_stub.c thr_debug.c OBJS = threads.lo rdwr.lo rmutex.lo tpool.lo rq.lo \ - thr_posix.lo thr_cthreads.lo thr_thr.lo thr_lwp.lo thr_nt.lo \ + thr_posix.lo thr_cthreads.lo thr_thr.lo thr_nt.lo \ thr_pth.lo thr_stub.lo thr_debug.lo \ bind.lo open.lo result.lo error.lo compare.lo search.lo \ controls.lo messages.lo references.lo extended.lo cyrus.lo \ -- 2.39.5