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 e7acc3e9cefd482f4a352529627a698216858e07..322c44d597362441a115da13ac8482e550e8a549 100644 (file)
--- 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 12bb7c07db8edbb0d6f174352cffb583728a8e47..77f3b3a9131e648c71c24330130905f67cebfb4e 100644 (file)
--- 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 ) {