From: Gary Williams <gwilliams@openldap.org>
Date: Thu, 6 May 1999 14:46:48 +0000 (+0000)
Subject: move socket.h before errno.h so EWOULDBLOCK is defined on NT
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~76
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=628f679f0b3ccf5bb979042a62b4ad8c0caa9d26;p=openldap

move socket.h before errno.h so EWOULDBLOCK is defined on NT
---

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index e7acc3e9ce..322c44d597 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -2,9 +2,9 @@
 
 #include <stdio.h>
 
+#include <ac/socket.h>
 #include <ac/errno.h>
 #include <ac/signal.h>
-#include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
@@ -133,6 +133,7 @@ int connections_shutdown(void)
 	}
 
 	ldap_pvt_thread_mutex_unlock( &connections_mutex );
+    return 0;
 }
 
 static Connection* connection_get( int s )
diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 12bb7c07db..77f3b3a913 100644
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -4,9 +4,9 @@
 
 #include <stdio.h>
 
+#include <ac/socket.h>
 #include <ac/errno.h>
 #include <ac/signal.h>
-#include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
 #include <ac/unistd.h>		/* get close() */
@@ -341,7 +341,7 @@ send_search_entry(
 		if ( connection_state_closing( conn ) ) {
 			ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 			ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
-			return;
+			return 0;
 		}
 
 		if ( ber_flush( &conn->c_sb, ber, 1 ) == 0 ) {