Convert all u_int to ISO uint

[netatalk.git] / libatalk / util / server_ipc.c

diff --git a/libatalk/util/server_ipc.c b/libatalk/util/server_ipc.c
index 76ec6c97a27c029ef0ea7135da2d3858840f92d9..ed4e1261ef0a0fb08c4f7fb371888efee13ad231 100644 (file)
--- a/libatalk/util/server_ipc.c
+++ b/libatalk/util/server_ipc.c
@@ -9,9 +9,7 @@
 #endif 
 
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -71,8 +69,8 @@ static int ipc_kill_token(struct ipc_header *ipc, server_child *children)
 /* ----------------- */
 static int ipc_get_session(struct ipc_header *ipc, server_child *children)
 {
-    u_int32_t boottime;
-    u_int32_t idlen;
+    uint32_t boottime;
+    uint32_t idlen;
     char     *clientid, *p;
 
     
@@ -189,7 +187,7 @@ int reconnect_ipc(AFPObj *obj)
     obj->ipc_fd = -1;
 
     srandom(getpid());
-    sleep((random() % 10) + 5);  /* give it enough time to start */
+    sleep((random() % 5) + 5);  /* give it enough time to start */
 
     while (retrycount++ < 10) {
         if ((obj->ipc_fd = ipc_client_uds(_PATH_AFP_IPC)) == -1) {
@@ -342,4 +340,3 @@ int ipc_child_write(int fd, uint16_t command, int len, void *msg)
 
    return 0;
 }
-