summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/include/includes.h6
-rw-r--r--source4/lib/tdb/tdb.c4
-rw-r--r--source4/lib/tdb/tdb.h2
-rw-r--r--source4/lib/tdb/tdbutil.c2
-rw-r--r--source4/nmbd/nmbd.c4
-rw-r--r--source4/wrepld/server.c2
6 files changed, 9 insertions, 11 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index ec744920ed..2241425323 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -422,10 +422,8 @@
/*
* 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
diff --git a/source4/lib/tdb/tdb.c b/source4/lib/tdb/tdb.c
index 0bcf4d5cb8..5367842cbb 100644
--- a/source4/lib/tdb/tdb.c
+++ b/source4/lib/tdb/tdb.c
@@ -194,9 +194,9 @@ struct list_struct {
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;
}
diff --git a/source4/lib/tdb/tdb.h b/source4/lib/tdb/tdb.h
index c9faa0464f..169de5f87d 100644
--- 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_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);
diff --git a/source4/lib/tdb/tdbutil.c b/source4/lib/tdb/tdbutil.c
index 3c22333b4d..4a4423d2ce 100644
--- 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 */
-static SIG_ATOMIC_T gotalarm;
+static sig_atomic_t gotalarm;
/***************************************************************
Signal function to tell us we timed out.
diff --git a/source4/nmbd/nmbd.c b/source4/nmbd/nmbd.c
index 166e84bfbe..0fa3525666 100644
--- 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.
**************************************************************************** */
-static SIG_ATOMIC_T got_sig_term;
+static sig_atomic_t got_sig_term;
static void sig_term(int sig)
{
@@ -93,7 +93,7 @@ static void sig_term(int sig)
Catch a SIGHUP signal.
**************************************************************************** */
-static SIG_ATOMIC_T reload_after_sighup;
+static sig_atomic_t reload_after_sighup;
static void sig_hup(int sig)
{
diff --git a/source4/wrepld/server.c b/source4/wrepld/server.c
index c4157f710e..f49596dc41 100644
--- a/source4/wrepld/server.c
+++ b/source4/wrepld/server.c
@@ -80,7 +80,7 @@ BOOL reload_services(BOOL test)
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)
{