Merge master

[netatalk.git] / libatalk / adouble / ad_sendfile.c

diff --git a/libatalk/adouble/ad_sendfile.c b/libatalk/adouble/ad_sendfile.c
index 48d9934645a901ba96ac8342cc3178e4e20f8ba0..2a1f1426aa45b6a5aeb1aa13614c46b3be17e078 100644 (file)
--- a/libatalk/adouble/ad_sendfile.c
+++ b/libatalk/adouble/ad_sendfile.c
@@ -1,6 +1,4 @@
 /*
- * $Id: ad_sendfile.c,v 1.10 2009-10-25 09:47:04 didg Exp $
- *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
  *
@@ -32,18 +30,15 @@
 #endif /* HAVE_CONFIG_H */
 
 #ifdef WITH_SENDFILE
-
-#include <atalk/adouble.h>
-
 #include <stdio.h>
-
 #include <sys/socket.h>
 #include <sys/uio.h>
-
 #include <errno.h>  
 
+#include <atalk/adouble.h>
 #include <atalk/logger.h>
-#include "ad_private.h"
+
+#include "ad_lock.h"
 
 #if defined(LINUX_BROKEN_SENDFILE_API)
 
@@ -83,7 +78,6 @@ ssize_t sys_sendfile(int tofd, int fromfd, off_t *offset, size_t count)
     return sendfile(tofd, fromfd, offset, count);
 }
 
-
 #elif defined(SENDFILE_FLAVOR_BSD )
 /* FIXME untested */
 #error sendfile semantic broken