asn1: Ensure asn1_tag_remaining() only ever returns -1 as an error condition.

[sfrench/samba-autobuild/.git] / lib / util / signal.c

diff --git a/lib/util/signal.c b/lib/util/signal.c
index ead947eb5e63332015774a8265942aa995f65dbf..3fc63b25e4409e3c31c0c9d64a18f416337fc3a4 100644 (file)
--- a/lib/util/signal.c
+++ b/lib/util/signal.c
@@ -18,8 +18,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/wait.h"
+#include "debug.h"
+#include "lib/util/signal.h" /* Avoid /usr/include/signal.h */
 
 /**
  * @file
@@ -129,16 +131,16 @@ void (*CatchSignal(int signum,void (*handler)(int )))(int)
  Ignore SIGCLD via whatever means is necessary for this OS.
 **/
 
-void CatchChild(void)
+void (*CatchChild(void))(int)
 {
-       CatchSignal(SIGCLD, sig_cld);
+       return CatchSignal(SIGCLD, sig_cld);
 }
 
 /**
  Catch SIGCLD but leave the child around so it's status can be reaped.
 **/
 
-void CatchChildLeaveStatus(void)
+void (*CatchChildLeaveStatus(void))(int)
 {
-       CatchSignal(SIGCLD, sig_cld_leave_status);
+       return CatchSignal(SIGCLD, sig_cld_leave_status);
 }