r3480: moved some signal defines into include/system

(This used to be commit a954e707ef5b23af84ef8f622336e36379c4a373)

diff --git a/source4/include/rewrite.h b/source4/include/rewrite.h
index 432be5609563b88dbae125d8a4a6dfeeb923355e..619942cac9c2de0aa26e5a0aa6e8d835a20e9f2f 100644 (file)
--- 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 0d8a5057e5b093a132aca285f464111e22d0bf91..2b800fd27012370541c7a07015cef830036c307e 100644 (file)
--- 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 d4c47582ad61cfa65e28abecd6e26e3bb8ba2192..543233ce82d82a99bb7e220e1d241055f4feb6b2 100644 (file)
--- 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 c9b5dc05e6c825e292b52a6747fced266f8fb5b1..b5187162cf90b37bc3d3c5e9f031bbcd0b16f9af 100644 (file)
--- 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