Merge branch 'develop'

[netatalk.git] / bin / megatron / macbin.c

diff --git a/bin/megatron/macbin.c b/bin/megatron/macbin.c
index b317c2fa2d0614ee93e9f8afd99f40e347e02545..51b7ac5f616ede35aeb604892e423e3bbf4a35e6 100644 (file)
--- a/bin/megatron/macbin.c
+++ b/bin/megatron/macbin.c
@@ -10,12 +10,8 @@
 #include <sys/uio.h>
 #include <sys/time.h>
 #include <sys/param.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <string.h>
 #include <strings.h>
 #include <ctype.h>
@@ -523,7 +519,7 @@ int bin_header_write(struct FHeader *fh)
 int test_header(void)
 {
     const char          zeros[25] = "";
-    u_int32_t          cc;
+    ssize_t            cc;
     u_short            header_crc;
     u_char             namelen;