From bc2a3748e9caa8f60f7c2387e7eecd7fb3fae899 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Wed, 14 May 2003 10:59:01 +0000 Subject: Prefix VFS API macros with SMB_ for consistency and to avoid problems with VFS_ macros at system side. We currently have one clash with AIX and its VFS_LOCK. Compiled and tested -- no new functionality or code, just plain rename of macros for yet-unreleased VFS API version. Needs to be done before a24 is out (This used to be commit c2689ed118b490e49497a76ed6a2251262018769) --- source3/include/vfs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/include/vfs.h') diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 852e926e6d..f10719144d 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -393,14 +393,14 @@ typedef struct vfs_handle_struct { } vfs_handle_struct; -#define VFS_HANDLE_GET_DATA(handle, datap, type, ret) { \ +#define SMB_VFS_HANDLE_GET_DATA(handle, datap, type, ret) { \ if (!(handle)||((datap=(type *)(handle)->data)==NULL)) { \ DEBUG(0,("%s() failed to get vfs_handle->data!\n",FUNCTION_MACRO)); \ ret; \ } \ } -#define VFS_HANDLE_SET_DATA(handle, datap, free_fn, type, ret) { \ +#define SMB_VFS_HANDLE_SET_DATA(handle, datap, free_fn, type, ret) { \ if (!(handle)) { \ DEBUG(0,("%s() failed to set handle->data!\n",FUNCTION_MACRO)); \ ret; \ @@ -413,13 +413,13 @@ typedef struct vfs_handle_struct { } \ } -#define VFS_HANDLE_FREE_DATA(handle) { \ +#define SMB_VFS_HANDLE_FREE_DATA(handle) { \ if ((handle) && (handle)->free_data) { \ (handle)->free_data(&(handle)->data); \ } \ } -#define VFS_OP(x) ((void *) x) +#define SMB_VFS_OP(x) ((void *) x) #include "vfs_macros.h" -- cgit