r3844: Attempt to get the build farm in line. Some systems seem to have defined

rewinddir as a macro and don't like the construct to call a function pointer
called rewinddir. Work around by renaming the function pointer...

Volker
(This used to be commit e547308d3ed307a242723076dff9974973fccc97)

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index babf18ec81f73b40299eeb3187511c60c9db20c0..e8c6ff32d558e56f9986fb0e89ecbaa41f319282 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -216,7 +216,7 @@ struct vfs_ops {
                SMB_STRUCT_DIRENT *(*readdir)(struct vfs_handle_struct *handle, struct connection_struct *conn, DIR *dirp);
                void (*seekdir)(struct vfs_handle_struct *handle, struct connection_struct *conn, DIR *dirp, long offset);
                long (*telldir)(struct vfs_handle_struct *handle, struct connection_struct *conn, DIR *dirp);
-               void (*rewinddir)(struct vfs_handle_struct *handle, struct connection_struct *conn, DIR *dirp);
+               void (*rewind_dir)(struct vfs_handle_struct *handle, struct connection_struct *conn, DIR *dirp);
                int (*mkdir)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *path, mode_t mode);
                int (*rmdir)(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *path);
                int (*closedir)(struct vfs_handle_struct *handle, struct connection_struct *conn, DIR *dir);
@@ -319,7 +319,7 @@ struct vfs_ops {
                struct vfs_handle_struct *readdir;
                struct vfs_handle_struct *seekdir;
                struct vfs_handle_struct *telldir;
-               struct vfs_handle_struct *rewinddir;
+               struct vfs_handle_struct *rewind_dir;
                struct vfs_handle_struct *mkdir;
                struct vfs_handle_struct *rmdir;
                struct vfs_handle_struct *closedir;

diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index b2c0027a21afaa5523596c529f659f9304465daa..79f5bbf3c1626532bc141aa2390187668b6a8662 100644 (file)
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -242,7 +242,7 @@
 #define SMB_VFS_NEXT_READDIR(handle, conn, dirp) ((handle)->vfs_next.ops.readdir((handle)->vfs_next.handles.readdir, (conn), (dirp))) 
 #define SMB_VFS_NEXT_SEEKDIR(handle, conn, dirp, offset) ((handle)->vfs_next.ops.seekdir((handle)->vfs_next.handles.seekdir, (conn), (dirp), (offset))) 
 #define SMB_VFS_NEXT_TELLDIR(handle, conn, dirp) ((handle)->vfs_next.ops.telldir((handle)->vfs_next.handles.telldir, (conn), (dirp))) 
-#define SMB_VFS_NEXT_REWINDDIR(handle, conn, dirp) ((handle)->vfs_next.ops.rewinddir((handle)->vfs_next.handles.rewinddir, (conn), (dirp))) 
+#define SMB_VFS_NEXT_REWINDDIR(handle, conn, dirp) ((handle)->vfs_next.ops.rewind_dir((handle)->vfs_next.handles.rewind_dir, (conn), (dirp))) 
 #define SMB_VFS_NEXT_DIR(handle, conn, dirp) ((handle)->vfs_next.ops.readdir((handle)->vfs_next.handles.readdir, (conn), (dirp))) 
 #define SMB_VFS_NEXT_MKDIR(handle, conn, path, mode) ((handle)->vfs_next.ops.mkdir((handle)->vfs_next.handles.mkdir,(conn), (path), (mode)))
 #define SMB_VFS_NEXT_RMDIR(handle, conn, path) ((handle)->vfs_next.ops.rmdir((handle)->vfs_next.handles.rmdir, (conn), (path)))