i before e and other cleanup

diff --git a/configure b/configure
index fac76761261ddff4de73a1a3228727ec2042388f..5c042d11de7efefd21ab24f28a4ddcfc79cf4b23 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.613 2006/01/06 04:39:05 kurt Exp .
+# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.614 2006/01/06 04:41:42 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_yeild=no
+                       ol_replace_sched_yield=no
                        case "$target" in
                        *-*-linux*)
-                               ol_replace_sched_yeild=yes
+                               ol_replace_sched_yield=yes
                        ;;
                        esac
 
-                       if test $ol_replace_sched_yeild = yes ; then
+                       if test $ol_replace_sched_yield = yes ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define REPLACE_SCHED_YEILD 1
+#define REPLACE_SCHED_YIELD 1
 _ACEOF
 
                        fi

diff --git a/configure.in b/configure.in
index 114955b24a8fdeacad6881030fab3dcbb5f3926a..5b4dea7cdac0b5f239f5cddc888838f4986bc017 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_yeild=no
+                       ol_replace_sched_yield=no
                        case "$target" in
                        *-*-linux*) 
-                               ol_replace_sched_yeild=yes
+                               ol_replace_sched_yield=yes
                        ;;
                        esac
 
-                       if test $ol_replace_sched_yeild = yes ; then
-                               AC_DEFINE([REPLACE_SCHED_YEILD],1,
-                                       [define to replace sched_yeild(2)])
+                       if test $ol_replace_sched_yield = yes ; then
+                               AC_DEFINE([REPLACE_SCHED_YIELD],1,
+                                       [define to replace sched_yield(2)])
                        fi
 
                        dnl Check if select causes an yield

diff --git a/include/portable.hin b/include/portable.hin
index 7367fbeee48d7a84a5b15f21477dc5c3b304a1c0..dce849a9c2d3c918f050c1f6887ff1866b82aa7b 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_yeild(2) */
-#undef REPLACE_SCHED_YEILD
+/* define to replace sched_yield(2) */
+#undef REPLACE_SCHED_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 6d399e9c16ebf7c2c410e7ddb9cb61c1704ff135..31b2ac58d4b72ca03bcc139a81b51bbeb288b30c 100644 (file)
--- a/libraries/libldap_r/thr_posix.c
+++ b/libraries/libldap_r/thr_posix.c
@@ -20,7 +20,7 @@
 
 #include <ac/errno.h>
 
-#if REPLACE_SCHED_YIELD
+#ifdef REPLACE_SCHED_YIELD
 #ifndef HAVE_NANOSLEEP
 #include <ac/socket.h>
 #endif