summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-02 11:53:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:20 -0500
commit8228a362a9d70ae51c04d11840fa081794d26c68 (patch)
treebeb756c1f804565acfea67b6fcb2ed774f4630e8
parent6bd02aa5046b606171a680e6f8aefba31b744af1 (diff)
downloadsamba-8228a362a9d70ae51c04d11840fa081794d26c68.tar.gz
samba-8228a362a9d70ae51c04d11840fa081794d26c68.tar.bz2
samba-8228a362a9d70ae51c04d11840fa081794d26c68.zip
r3480: moved some signal defines into include/system
(This used to be commit a954e707ef5b23af84ef8f622336e36379c4a373)
-rw-r--r--source4/include/rewrite.h12
-rw-r--r--source4/include/system/select.h4
-rw-r--r--source4/include/system/wait.h4
-rw-r--r--source4/lib/tdb/common/tdbutil.c1
4 files changed, 9 insertions, 12 deletions
diff --git a/source4/include/rewrite.h b/source4/include/rewrite.h
index 432be56095..619942cac9 100644
--- a/source4/include/rewrite.h
+++ b/source4/include/rewrite.h
@@ -54,18 +54,6 @@ typedef int BOOL;
#include "enums.h"
#include "events.h"
-#ifndef LOCKING_VERSION
-#define LOCKING_VERSION 4
-#endif /* LOCKING_VERSION */
-
-#ifndef SIGNAL_CAST
-#define SIGNAL_CAST (RETSIGTYPE (*)(int))
-#endif
-
-#ifndef SELECT_CAST
-#define SELECT_CAST
-#endif
-
/*
* Loopback command offsets.
*/
diff --git a/source4/include/system/select.h b/source4/include/system/select.h
index 0d8a5057e5..2b800fd270 100644
--- a/source4/include/system/select.h
+++ b/source4/include/system/select.h
@@ -24,3 +24,7 @@
#include <sys/select.h>
#endif
+#ifndef SELECT_CAST
+#define SELECT_CAST
+#endif
+
diff --git a/source4/include/system/wait.h b/source4/include/system/wait.h
index d4c47582ad..543233ce82 100644
--- a/source4/include/system/wait.h
+++ b/source4/include/system/wait.h
@@ -35,3 +35,7 @@ typedef int sig_atomic_t;
#define SIGCLD SIGCHLD
#endif
+#ifndef SIGNAL_CAST
+#define SIGNAL_CAST (RETSIGTYPE (*)(int))
+#endif
+
diff --git a/source4/lib/tdb/common/tdbutil.c b/source4/lib/tdb/common/tdbutil.c
index c9b5dc05e6..b5187162cf 100644
--- a/source4/lib/tdb/common/tdbutil.c
+++ b/source4/lib/tdb/common/tdbutil.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "system/glob.h"
+#include "system/wait.h"
#include "dlinklist.h"
/* these are little tdb utility functions that are meant to make