ITS#3950 tweak prev commit, s/REPLACE_SCHED_YIELD/REPLACE_BROKEN_YIELD/

diff --git a/configure b/configure
index 5c042d11de7efefd21ab24f28a4ddcfc79cf4b23..73483f11486b0fe6af62a9f370296f546e91e8b0 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.614 2006/01/06 04:41:42 kurt Exp .
+# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.615 2006/01/06 04:50:53 kurt Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -24743,17 +24743,17 @@ echo "$as_me: error: pthread_create is not usable, check environment settings" >
    { (exit 1); exit 1; }; }
                        fi
 
-                       ol_replace_sched_yield=no
+                       ol_replace_broken_yield=no
                        case "$target" in
                        *-*-linux*)
-                               ol_replace_sched_yield=yes
+                               ol_replace_broken_yield=yes
                        ;;
                        esac
 
-                       if test $ol_replace_sched_yield = yes ; then
+                       if test $ol_replace_broken_yield = yes ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define REPLACE_SCHED_YIELD 1
+#define REPLACE_BROKEN_YIELD 1
 _ACEOF
 
                        fi

diff --git a/configure.in b/configure.in
index 5b4dea7cdac0b5f239f5cddc888838f4986bc017..707abf248c8663ea77fb55b97014900f8c10770c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1587,16 +1587,16 @@ dnl                     [ol_cv_pthread_lpthread_lexc])
                                AC_MSG_ERROR([pthread_create is not usable, check environment settings])
                        fi
 
-                       ol_replace_sched_yield=no
+                       ol_replace_broken_yield=no
                        case "$target" in
                        *-*-linux*) 
-                               ol_replace_sched_yield=yes
+                               ol_replace_broken_yield=yes
                        ;;
                        esac
 
-                       if test $ol_replace_sched_yield = yes ; then
-                               AC_DEFINE([REPLACE_SCHED_YIELD],1,
-                                       [define to replace sched_yield(2)])
+                       if test $ol_replace_broken_yield = yes ; then
+                               AC_DEFINE([REPLACE_BROKEN_YIELD],1,
+                                       [define if sched_yield yields the entire process])
                        fi
 
                        dnl Check if select causes an yield

diff --git a/include/portable.hin b/include/portable.hin
index dce849a9c2d3c918f050c1f6887ff1866b82aa7b..4983684d223b556f39bb41d69887e43060d6f6dd 100644 (file)
--- a/include/portable.hin
+++ b/include/portable.hin
@@ -912,8 +912,8 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* define to replace sched_yield(2) */
-#undef REPLACE_SCHED_YIELD
+/* define if sched_yield yields the entire process */
+#undef REPLACE_BROKEN_YIELD
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #undef RETSIGTYPE

diff --git a/libraries/libldap_r/thr_posix.c b/libraries/libldap_r/thr_posix.c
index 31b2ac58d4b72ca03bcc139a81b51bbeb288b30c..c867e5715bebe9a895b2d8f2c9fb8d23c814c877 100644 (file)
--- a/libraries/libldap_r/thr_posix.c
+++ b/libraries/libldap_r/thr_posix.c
@@ -20,7 +20,7 @@
 
 #include <ac/errno.h>
 
-#ifdef REPLACE_SCHED_YIELD
+#ifdef REPLACE_BROKEN_YIELD
 #ifndef HAVE_NANOSLEEP
 #include <ac/socket.h>
 #endif
@@ -214,7 +214,7 @@ ldap_pvt_thread_kill( ldap_pvt_thread_t thread, int signo )
 int 
 ldap_pvt_thread_yield( void )
 {
-#ifdef REPLACE_SCHED_YIELD
+#ifdef REPLACE_BROKEN_YIELD
 #ifdef HAVE_NANOSLEEP
        struct timespec t = { 0, 0 };
        nanosleep(&t, NULL);