Try to sort out compile hell.

diff --git a/libatalk/adouble/ad_date.c b/libatalk/adouble/ad_date.c
index 082be9a4837859da636f6db90a23fed488a69372..0e1ffbe1ffcf3f096829b893176d575b35b57d2a 100644 (file)
--- a/libatalk/adouble/ad_date.c
+++ b/libatalk/adouble/ad_date.c
@@ -1,16 +1,13 @@
 /*
- * $Id: ad_date.c,v 1.3 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: ad_date.c,v 1.3.14.1 2004-02-20 19:57:14 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include <atalk/adouble.h>
+#include <string.h>
 
 int ad_setdate(const struct adouble *ad, 
               unsigned int dateoff, u_int32_t date)

diff --git a/libatalk/adouble/ad_lock.c b/libatalk/adouble/ad_lock.c
index 3c8552963b41e6abe50f9c426aad9cd83781779b..9dfb14648ec1f47d08c5f688957086ce30d0ba73 100644 (file)
--- a/libatalk/adouble/ad_lock.c
+++ b/libatalk/adouble/ad_lock.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: ad_lock.c,v 1.11.6.2 2004-01-28 10:15:39 didg Exp $
+ * $Id: ad_lock.c,v 1.11.6.3 2004-02-20 19:57:14 didg Exp $
  *
  * Copyright (c) 1998,1999 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT for more information.
@@ -20,18 +20,13 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include <atalk/adouble.h>
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #include <errno.h>
 
-#include <atalk/adouble.h>
+#include <string.h>
 
 #include "ad_private.h"
 

diff --git a/libatalk/adouble/ad_mmap.c b/libatalk/adouble/ad_mmap.c
index 6a04944b9e3f782eef2b9ed6606fecab47ee79f8..0d6df4caa7e5c4eaac5151719d4517d79bdd8d62 100644 (file)
--- a/libatalk/adouble/ad_mmap.c
+++ b/libatalk/adouble/ad_mmap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ad_mmap.c,v 1.4 2002-10-05 13:20:14 didg Exp $
+ * $Id: ad_mmap.c,v 1.4.8.1 2004-02-20 19:57:14 didg Exp $
  *
  * ad_mmap provides interfaces to memory mapped files. as this is the
  * case, we don't have to deal w/ temporary buffers such as
@@ -13,17 +13,9 @@
 
 #ifdef USE_MMAPPED_HEADERS
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#include <string.h>
 
 #include <atalk/adouble.h>
+#include <string.h>
 
 #include "ad_private.h"
 

diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c
index 08cc7fb9673c984eb0c763329d9f0f38b182c24b..09741757216ce8d364c0e7a016bce11f407629ed 100644 (file)
--- a/libatalk/adouble/ad_open.c
+++ b/libatalk/adouble/ad_open.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ad_open.c,v 1.30.6.7 2004-02-14 15:47:22 didg Exp $
+ * $Id: ad_open.c,v 1.30.6.8 2004-02-20 19:57:14 didg Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -31,25 +31,14 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <string.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <errno.h>
-#include <atalk/logger.h>
 
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <atalk/adouble.h>
 #include <sys/param.h>
-#include <sys/mman.h>
+#include <atalk/logger.h>
 
-#include <netatalk/endian.h>
-#include <atalk/adouble.h>
 #include <atalk/util.h>
+#include <string.h>
 
 #include "ad_private.h"
 

diff --git a/libatalk/adouble/ad_sendfile.c b/libatalk/adouble/ad_sendfile.c
index 562e5a14c92cbdbef7a803bd9a6ccc9ba31ac1e6..5245c6aeef4cf387bb15cd8a389256ccbb08cfcd 100644 (file)
--- a/libatalk/adouble/ad_sendfile.c
+++ b/libatalk/adouble/ad_sendfile.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ad_sendfile.c,v 1.6.6.1 2003-10-17 00:01:13 didg Exp $
+ * $Id: ad_sendfile.c,v 1.6.6.2 2004-02-20 19:57:15 didg Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -33,17 +33,14 @@
 
 #ifdef WITH_SENDFILE
 
+#include <atalk/adouble.h>
+
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#include <sys/types.h>
-#include <sys/stat.h>
+
 #include <sys/socket.h>
 #include <sys/uio.h>
 
 #include <errno.h>  
-#include <atalk/adouble.h>
 
 #include <atalk/logger.h>
 

diff --git a/libatalk/adouble/ad_size.c b/libatalk/adouble/ad_size.c
index 5a63fc442f6c1779105ce1bb2338b2f246ef78dd..f0a0953af35091299920a37e20911662ffc1bbe9 100644 (file)
--- a/libatalk/adouble/ad_size.c
+++ b/libatalk/adouble/ad_size.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ad_size.c,v 1.5 2002-10-11 14:18:38 didg Exp $
+ * $Id: ad_size.c,v 1.5.6.1 2004-02-20 19:57:15 didg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -11,14 +11,7 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <atalk/logger.h>
-
 #include <atalk/adouble.h>
 
 off_t ad_size(const struct adouble *ad, const u_int32_t eid)