Merge remote branch 'netafp/master' into branch-allea

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

diff --git a/libatalk/util/server_ipc.c b/libatalk/util/server_ipc.c
index e74ce91b1f5a13b1358543e93aa1f21959d84dea..d40e3a49ea4cb07bf1b7984fc418cb5ec11521ee 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;
 
     
@@ -349,4 +347,3 @@ int ipc_child_write(int fd, uint16_t command, int len, void *msg)
 
    return 0;
 }
-