From 8228a362a9d70ae51c04d11840fa081794d26c68 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 2 Nov 2004 11:53:44 +0000 Subject: r3480: moved some signal defines into include/system (This used to be commit a954e707ef5b23af84ef8f622336e36379c4a373) --- source4/include/rewrite.h | 12 ------------ source4/include/system/select.h | 4 ++++ source4/include/system/wait.h | 4 ++++ source4/lib/tdb/common/tdbutil.c | 1 + 4 files changed, 9 insertions(+), 12 deletions(-) (limited to 'source4') 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 #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 -- cgit