diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-06-25 02:53:13 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-06-25 02:53:13 +0000 |
| commit | b95a294a0879e800e816281a80d0074224cd8cd4 (patch) | |
| tree | f6f57c9b0138c1a3027fa1ed78186d9df0830c0d /source3/smbd/oplock_linux.c | |
| parent | 413ad23faff509332985d6972c931900af2fd5f5 (diff) | |
| download | samba-b95a294a0879e800e816281a80d0074224cd8cd4.tar.gz samba-b95a294a0879e800e816281a80d0074224cd8cd4.tar.bz2 samba-b95a294a0879e800e816281a80d0074224cd8cd4.zip | |
fixed usage of socklen_t and also tidied up SIG_ATOMIC_T, using a typedef instead of a define
(This used to be commit e2ecff419fdc0a0dc7551b33b377dc11061ef2a3)
Diffstat (limited to 'source3/smbd/oplock_linux.c')
| -rw-r--r-- | source3/smbd/oplock_linux.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c index 9edeb1b513..39ee3eb86b 100644 --- a/source3/smbd/oplock_linux.c +++ b/source3/smbd/oplock_linux.c @@ -25,9 +25,9 @@ extern int DEBUGLEVEL; -static VOLATILE SIG_ATOMIC_T signals_received; -static VOLATILE SIG_ATOMIC_T signals_processed; -static VOLATILE SIG_ATOMIC_T fd_pending; /* the fd of the current pending signal */ +static VOLATILE sig_atomic_t signals_received; +static VOLATILE sig_atomic_t signals_processed; +static VOLATILE sig_atomic_t fd_pending; /* the fd of the current pending signal */ #ifndef F_SETLEASE #define F_SETLEASE 1024 @@ -55,7 +55,7 @@ handle a LEASE signal, incrementing the signals_received and blocking the signal static void signal_handler(int sig, siginfo_t *info, void *unused) { BlockSignals(True, sig); - fd_pending = (SIG_ATOMIC_T)info->si_fd; + fd_pending = (sig_atomic_t)info->si_fd; signals_received++; sys_select_signal(); } @@ -160,7 +160,7 @@ dev = %x, inode = %.0f\n", (unsigned int)dev, (double)inode )); out: /* now we can receive more signals */ - fd_pending = (SIG_ATOMIC_T)-1; + fd_pending = (sig_atomic_t)-1; signals_processed++; BlockSignals(False, RT_SIGNAL_LEASE); |