git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3744324
)
switch from SIG_ATOMIC_T to sig_atomic_t
author
Andrew Tridgell
<tridge@samba.org>
Sun, 28 Mar 2004 01:57:28 +0000
(
01:57
+0000)
committer
Andrew Tridgell
<tridge@samba.org>
Sun, 28 Mar 2004 01:57:28 +0000
(
01:57
+0000)
(This used to be commit
b881b72cb9cb5a4a8ad27b621e8cbe9dcfa7ba7f
)
source4/include/includes.h
patch
|
blob
|
history
source4/lib/tdb/tdb.c
patch
|
blob
|
history
source4/lib/tdb/tdb.h
patch
|
blob
|
history
source4/lib/tdb/tdbutil.c
patch
|
blob
|
history
source4/nmbd/nmbd.c
patch
|
blob
|
history
source4/wrepld/server.c
patch
|
blob
|
history
diff --git
a/source4/include/includes.h
b/source4/include/includes.h
index ec744920ed804938e56b4a4207058b78d9ade0d6..224142532313da47e8a4aee09ce49a3ceda7ea51 100644
(file)
--- a/
source4/include/includes.h
+++ b/
source4/include/includes.h
@@
-422,10
+422,8
@@
/*
* Define additional missing types
*/
/*
* Define additional missing types
*/
-#if defined(HAVE_SIG_ATOMIC_T_TYPE)
-typedef sig_atomic_t SIG_ATOMIC_T;
-#else
-typedef int SIG_ATOMIC_T;
+#ifndef HAVE_SIG_ATOMIC_T_TYPE
+typedef int sig_atomic_t;
#endif
#ifndef HAVE_SOCKLEN_T_TYPE
#endif
#ifndef HAVE_SOCKLEN_T_TYPE
diff --git
a/source4/lib/tdb/tdb.c
b/source4/lib/tdb/tdb.c
index 0bcf4d5cb8c0ab3c11d2343277c678b88c55152f..5367842cbba152f7ed1885f492ac8e8d6758ddee 100644
(file)
--- a/
source4/lib/tdb/tdb.c
+++ b/
source4/lib/tdb/tdb.c
@@
-194,9
+194,9
@@
struct list_struct {
a blocking lock on SIGALRM.
***************************************************************/
a blocking lock on SIGALRM.
***************************************************************/
-static
SIG_ATOMIC_T
*palarm_fired;
+static
sig_atomic_t
*palarm_fired;
-void tdb_set_lock_alarm(
SIG_ATOMIC_T
*palarm)
+void tdb_set_lock_alarm(
sig_atomic_t
*palarm)
{
palarm_fired = palarm;
}
{
palarm_fired = palarm;
}
diff --git
a/source4/lib/tdb/tdb.h
b/source4/lib/tdb/tdb.h
index c9faa0464fd36278fed3af73796f89d928b3faf7..169de5f87d548c42b9f421cc84a0bbbebf461ba2 100644
(file)
--- a/
source4/lib/tdb/tdb.h
+++ b/
source4/lib/tdb/tdb.h
@@
-134,7
+134,7
@@
int tdb_lockall(TDB_CONTEXT *tdb);
void tdb_unlockall(TDB_CONTEXT *tdb);
/* Low level locking functions: use with care */
void tdb_unlockall(TDB_CONTEXT *tdb);
/* Low level locking functions: use with care */
-void tdb_set_lock_alarm(
SIG_ATOMIC_T
*palarm);
+void tdb_set_lock_alarm(
sig_atomic_t
*palarm);
int tdb_chainlock(TDB_CONTEXT *tdb, TDB_DATA key);
int tdb_chainunlock(TDB_CONTEXT *tdb, TDB_DATA key);
int tdb_chainlock(TDB_CONTEXT *tdb, TDB_DATA key);
int tdb_chainunlock(TDB_CONTEXT *tdb, TDB_DATA key);
diff --git
a/source4/lib/tdb/tdbutil.c
b/source4/lib/tdb/tdbutil.c
index 3c22333b4de362c59caf2327297896f43469c4a0..4a4423d2ce79f16615eeb654098ecdf5dda66675 100644
(file)
--- a/
source4/lib/tdb/tdbutil.c
+++ b/
source4/lib/tdb/tdbutil.c
@@
-24,7
+24,7
@@
/* these are little tdb utility functions that are meant to make
dealing with a tdb database a little less cumbersome in Samba */
/* these are little tdb utility functions that are meant to make
dealing with a tdb database a little less cumbersome in Samba */
-static
SIG_ATOMIC_T
gotalarm;
+static
sig_atomic_t
gotalarm;
/***************************************************************
Signal function to tell us we timed out.
/***************************************************************
Signal function to tell us we timed out.
diff --git
a/source4/nmbd/nmbd.c
b/source4/nmbd/nmbd.c
index 166e84bfbe905f79277c030f31bad1cbc68dcae2..0fa3525666e2048742c71783495345d5ba473043 100644
(file)
--- a/
source4/nmbd/nmbd.c
+++ b/
source4/nmbd/nmbd.c
@@
-81,7
+81,7
@@
static void nmbd_terminate(int msg_type, pid_t src, void *buf, size_t len)
Catch a SIGTERM signal.
**************************************************************************** */
Catch a SIGTERM signal.
**************************************************************************** */
-static
SIG_ATOMIC_T
got_sig_term;
+static
sig_atomic_t
got_sig_term;
static void sig_term(int sig)
{
static void sig_term(int sig)
{
@@
-93,7
+93,7
@@
static void sig_term(int sig)
Catch a SIGHUP signal.
**************************************************************************** */
Catch a SIGHUP signal.
**************************************************************************** */
-static
SIG_ATOMIC_T
reload_after_sighup;
+static
sig_atomic_t
reload_after_sighup;
static void sig_hup(int sig)
{
static void sig_hup(int sig)
{
diff --git
a/source4/wrepld/server.c
b/source4/wrepld/server.c
index c4157f710ef9a89963dbd46bd53b002d5f5e624d..f49596dc41df718ea9f2b534dfaff2bd6cb268a1 100644
(file)
--- a/
source4/wrepld/server.c
+++ b/
source4/wrepld/server.c
@@
-80,7
+80,7
@@
BOOL reload_services(BOOL test)
Catch a sighup.
****************************************************************************/
Catch a sighup.
****************************************************************************/
-VOLATILE
SIG_ATOMIC_T
reload_after_sighup = False;
+VOLATILE
sig_atomic_t
reload_after_sighup = False;
static void sig_hup(int sig)
{
static void sig_hup(int sig)
{