summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-07-06 15:05:02 +0200
committerJeremy Allison <jra@samba.org>2012-07-18 15:40:35 -0700
commitf9df073a31a813f5ee50d4d8ea3ec590e1a3e970 (patch)
tree02e95cfa1bf9050d213b51705f7d349335d66e13 /source3/include
parent715653a335acec525e8b0aa6d24d840d9d347eb9 (diff)
downloadsamba-f9df073a31a813f5ee50d4d8ea3ec590e1a3e970.tar.gz
samba-f9df073a31a813f5ee50d4d8ea3ec590e1a3e970.tar.bz2
samba-f9df073a31a813f5ee50d4d8ea3ec590e1a3e970.zip
s3: Make smbd/aio.c not depend on aio.h anymore
Signed-off-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h4
-rw-r--r--source3/include/vfs.h6
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index d621b7e4c0..cfd4d9aa52 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -149,10 +149,6 @@
#include <netgroup.h>
#endif
-#if defined(HAVE_AIO_H) && defined(HAVE_AIO)
-#include <aio.h>
-#endif
-
/* Special macros that are no-ops except when run under Valgrind on
* x86. They've moved a little bit from valgrind 1.0.4 to 1.9.4 */
#if HAVE_VALGRIND_MEMCHECK_H
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 9e2c6b54b0..1d9a2cd056 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -451,6 +451,12 @@ enum vfs_fallocate_mode {
};
/*
+ * forward declaration required here until the posix aio functions
+ * leave the VFS
+ */
+struct aiocb;
+
+/*
Available VFS operations. These values must be in sync with vfs_ops struct
(struct vfs_fn_pointers and struct vfs_handle_pointers inside of struct vfs_ops).
In particular, if new operations are added to vfs_ops, appropriate constants