diff options
| author | Volker Lendecke <vl@samba.org> | 2008-06-09 15:33:28 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-06-09 15:01:42 +0200 |
| commit | aeb9eb85eb05700f0890d4cc91f070f416f751b3 (patch) | |
| tree | a769c8261bad9d7a74ef5539726bdce6369fdf06 /source3/include/vfs.h | |
| parent | 7932e475a5a587054089cb1dc60c7a920cdef630 (diff) | |
| download | samba-aeb9eb85eb05700f0890d4cc91f070f416f751b3.tar.gz samba-aeb9eb85eb05700f0890d4cc91f070f416f751b3.tar.bz2 samba-aeb9eb85eb05700f0890d4cc91f070f416f751b3.zip | |
Fix the compile on NetBSD -- readlink and read are macros there
(cherry picked from commit 435b80a9a2e9324cc20594d922b3d8d6418c27af)
(This used to be commit 055bb54fa646f6de7d7b748deaebd69ddeff33d1)
Diffstat (limited to 'source3/include/vfs.h')
| -rw-r--r-- | source3/include/vfs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 7f285b7770..9b72f69328 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -304,7 +304,7 @@ struct vfs_ops { int (*open)(struct vfs_handle_struct *handle, const char *fname, files_struct *fsp, int flags, mode_t mode); int (*close_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp); - ssize_t (*read)(struct vfs_handle_struct *handle, struct files_struct *fsp, void *data, size_t n); + ssize_t (*vfs_read)(struct vfs_handle_struct *handle, struct files_struct *fsp, void *data, size_t n); ssize_t (*pread)(struct vfs_handle_struct *handle, struct files_struct *fsp, void *data, size_t n, SMB_OFF_T offset); ssize_t (*write)(struct vfs_handle_struct *handle, struct files_struct *fsp, const void *data, size_t n); ssize_t (*pwrite)(struct vfs_handle_struct *handle, struct files_struct *fsp, const void *data, size_t n, SMB_OFF_T offset); @@ -331,7 +331,7 @@ struct vfs_ops { int (*linux_setlease)(struct vfs_handle_struct *handle, struct files_struct *fsp, int leasetype); bool (*getlock)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid); int (*symlink)(struct vfs_handle_struct *handle, const char *oldpath, const char *newpath); - int (*readlink)(struct vfs_handle_struct *handle, const char *path, char *buf, size_t bufsiz); + int (*vfs_readlink)(struct vfs_handle_struct *handle, const char *path, char *buf, size_t bufsiz); int (*link)(struct vfs_handle_struct *handle, const char *oldpath, const char *newpath); int (*mknod)(struct vfs_handle_struct *handle, const char *path, mode_t mode, SMB_DEV_T dev); char *(*realpath)(struct vfs_handle_struct *handle, const char *path, char *resolved_path); @@ -451,7 +451,7 @@ struct vfs_ops { struct vfs_handle_struct *open; struct vfs_handle_struct *close_hnd; - struct vfs_handle_struct *read; + struct vfs_handle_struct *vfs_read; struct vfs_handle_struct *pread; struct vfs_handle_struct *write; struct vfs_handle_struct *pwrite; @@ -478,7 +478,7 @@ struct vfs_ops { struct vfs_handle_struct *linux_setlease; struct vfs_handle_struct *getlock; struct vfs_handle_struct *symlink; - struct vfs_handle_struct *readlink; + struct vfs_handle_struct *vfs_readlink; struct vfs_handle_struct *link; struct vfs_handle_struct *mknod; struct vfs_handle_struct *realpath; |