diff options
| author | Jim McDonough <jmcd@samba.org> | 2005-08-05 01:23:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:00:25 -0500 |
| commit | 21a6af31d93b628b9485d6f95ad8ee6099749980 (patch) | |
| tree | 2a72f0f4f0d4b9dde85e3ad39e5686be85c9576a /source3/include/vfs.h | |
| parent | 52cd17689159430d3ccb45b21de53e604708454e (diff) | |
| download | samba-21a6af31d93b628b9485d6f95ad8ee6099749980.tar.gz samba-21a6af31d93b628b9485d6f95ad8ee6099749980.tar.bz2 samba-21a6af31d93b628b9485d6f95ad8ee6099749980.zip | |
r9091: Fix #2954, aix 5.1 compile. Stupid aix aio.h header defines aio_error and
aio_return as macros...
(This used to be commit 65adbd83fe6a29705e9831d118fb0e0f93f2ef1f)
Diffstat (limited to 'source3/include/vfs.h')
| -rw-r--r-- | source3/include/vfs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 7f6c94f6e9..c7c7575d90 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -316,9 +316,9 @@ struct vfs_ops { /* aio operations */ int (*aio_read)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); int (*aio_write)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); - ssize_t (*aio_return)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); + ssize_t (*aio_return_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); int (*aio_cancel)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, SMB_STRUCT_AIOCB *aiocb); - int (*aio_error)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); + int (*aio_error_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb); int (*aio_fsync)(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, SMB_STRUCT_AIOCB *aiocb); int (*aio_suspend)(struct vfs_handle_struct *handle, struct files_struct *fsp, const SMB_STRUCT_AIOCB * const aiocb[], int n, const struct timespec *timeout); |