diff options
| author | Herb Lewis <herb@samba.org> | 2006-12-12 17:38:42 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:16:26 -0500 |
| commit | 791f48f167de339c8ae371e5c80706511fd10018 (patch) | |
| tree | de938796cdcc79502b4c8257b9239e5f5070051f /source3/include | |
| parent | 243b462b094f80d89020bdad78a531a857281bad (diff) | |
| download | samba-791f48f167de339c8ae371e5c80706511fd10018.tar.gz samba-791f48f167de339c8ae371e5c80706511fd10018.tar.bz2 samba-791f48f167de339c8ae371e5c80706511fd10018.zip | |
r20124: clean up nested extern declaration warnings
(This used to be commit ac3eb7813e33b9a2e78c9158433f7ed62c3b62bb)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/smb_macros.h | 4 |
1 files changed, 2 insertions, 2 deletions
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) \ |