From 791f48f167de339c8ae371e5c80706511fd10018 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Tue, 12 Dec 2006 17:38:42 +0000 Subject: r20124: clean up nested extern declaration warnings (This used to be commit ac3eb7813e33b9a2e78c9158433f7ed62c3b62bb) --- source3/include/smb_macros.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/smb_macros.h') diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index 44f15734d9..4b4351347f 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -86,10 +86,10 @@ #define IS_IPC(conn) ((conn) && (conn)->ipc) #define IS_PRINT(conn) ((conn) && (conn)->printer) /* you must add the following extern declaration to files using this macro + * (do not add it to the macro as that causes nested extern declaration warnings) * extern struct current_user current_user; */ #define FSP_BELONGS_CONN(fsp,conn) do {\ - extern struct current_user current_user;\ if (!((fsp) && (conn) && ((conn)==(fsp)->conn) && (current_user.vuid==(fsp)->vuid))) \ return ERROR_NT(NT_STATUS_INVALID_HANDLE); \ } while(0) @@ -97,10 +97,10 @@ #define FNUM_OK(fsp,c) ((fsp) && !(fsp)->is_directory && (c)==(fsp)->conn && current_user.vuid==(fsp)->vuid) /* you must add the following extern declaration to files using this macro + * (do not add it to the macro as that causes nested extern declaration warnings) * extern struct current_user current_user; */ #define CHECK_FSP(fsp,conn) do {\ - extern struct current_user current_user;\ if (!(fsp) || !(conn)) \ return ERROR_NT(NT_STATUS_INVALID_HANDLE); \ else if (((conn) != (fsp)->conn) || current_user.vuid != (fsp)->vuid) \ -- cgit