diff options
| author | Herb Lewis <herb@samba.org> | 2005-04-06 16:28:04 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:30 -0500 |
| commit | 978ca8486031e43754a3c23757f361bf3a85f335 (patch) | |
| tree | 109bd3ff560afcbd74296990d9554859cb2fb78f /source3/smbd/oplock_linux.c | |
| parent | 60dd0d0f9c277eb9852924aea81fee06b7395832 (diff) | |
| download | samba-978ca8486031e43754a3c23757f361bf3a85f335.tar.gz samba-978ca8486031e43754a3c23757f361bf3a85f335.tar.bz2 samba-978ca8486031e43754a3c23757f361bf3a85f335.zip | |
r6225: get rid of warnings from my compiler about nested externs
(This used to be commit efea76ac71412f8622cd233912309e91b9ea52da)
Diffstat (limited to 'source3/smbd/oplock_linux.c')
| -rw-r--r-- | source3/smbd/oplock_linux.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c index fe324577e1..5d6bdb9883 100644 --- a/source3/smbd/oplock_linux.c +++ b/source3/smbd/oplock_linux.c @@ -22,6 +22,22 @@ #if HAVE_KERNEL_OPLOCKS_LINUX +/* these can be removed when they are in glibc headers */ +struct cap_user_header { + uint32 version; + int pid; +} header; +struct cap_user_data { + uint32 effective; + uint32 permitted; + uint32 inheritable; +} data; + +extern int capget(struct cap_user_header * hdrp, + struct cap_user_data * datap); +extern int capset(struct cap_user_header * hdrp, + const struct cap_user_data * datap); + static SIG_ATOMIC_T signals_received; #define FD_PENDING_SIZE 100 static SIG_ATOMIC_T fd_pending_array[FD_PENDING_SIZE]; @@ -68,22 +84,6 @@ static void set_capability(unsigned capability) #ifndef _LINUX_CAPABILITY_VERSION #define _LINUX_CAPABILITY_VERSION 0x19980330 #endif - /* these can be removed when they are in glibc headers */ - struct cap_user_header { - uint32 version; - int pid; - } header; - struct cap_user_data { - uint32 effective; - uint32 permitted; - uint32 inheritable; - } data; - - extern int capget(struct cap_user_header * hdrp, - struct cap_user_data * datap); - extern int capset(struct cap_user_header * hdrp, - const struct cap_user_data * datap); - header.version = _LINUX_CAPABILITY_VERSION; header.pid = 0; |