[master] 7e144bde3 Haiku build fix

[Nils Goroll]

commit 7e144bde31aac46788c058351f07d4f97fe1a48f
Author: David Carlier <devnexen at gmail.com>
Date:   Tue Jul 21 07:44:35 2020 +0000

    Haiku build fix
    
    Mainly WCOREDUMP is undefine but WIFCORED has similar semantic.

diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index 9c3bbd02d..418851f86 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -34,7 +34,6 @@
 #include "config.h"
 
 #include <sys/types.h>
-#include <sys/wait.h>
 
 #include <poll.h>
 #include <signal.h>
@@ -49,6 +48,8 @@
 
 #include "mgt.h"
 
+#include "vapi/vsig.h"
+
 #include "vbm.h"
 #include "vcli_serve.h"
 #include "vev.h"
diff --git a/bin/varnishtest/vtc_subr.c b/bin/varnishtest/vtc_subr.c
index 1d549ab60..087cb71b7 100644
--- a/bin/varnishtest/vtc_subr.c
+++ b/bin/varnishtest/vtc_subr.c
@@ -36,7 +36,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <unistd.h>
-#include <sys/wait.h>
 #include <sys/resource.h>
 
 #include "vtc.h"
@@ -45,6 +44,9 @@
 #include "vnum.h"
 #include "vre.h"
 
+#include "vapi/voptget.h"
+#include "vapi/vsig.h"
+
 struct vsb *
 vtc_hex_to_bin(struct vtclog *vl, const char *arg)
 {
@@ -145,10 +147,6 @@ vtc_expect(struct vtclog *vl,
  * otherwise, the process must die on exit(expect_status)
  */
 
-#ifndef WCOREDUMP
-#  define WCOREDUMP(s) (-1)
-#endif
-
 void
 vtc_wait4(struct vtclog *vl, long pid,
     int expect_status, int expect_signal, int allow_core)
diff --git a/include/vapi/vsig.h b/include/vapi/vsig.h
index 810b37dce..0c1bdcb7d 100644
--- a/include/vapi/vsig.h
+++ b/include/vapi/vsig.h
@@ -39,4 +39,14 @@
 
 #include "tbl/vsig_list.h"
 
+#include <sys/wait.h>
+
+#ifndef WCOREDUMP
+#  ifdef WIFCORED
+#    define WCOREDUMP(s) WIFCORED(s)
+#  else
+#    define WCOREDUMP(s) (-1)
+#  endif
+#endif
+
 #endif /* VAPI_VSC_H_INCLUDED */
diff --git a/lib/libvarnish/vsub.c b/lib/libvarnish/vsub.c
index eade83bac..56308f6b3 100644
--- a/lib/libvarnish/vsub.c
+++ b/lib/libvarnish/vsub.c
@@ -46,6 +46,8 @@
 
 #include "vdef.h"
 
+#include "vapi/vsig.h"
+
 #include "vas.h"
 #include "vfil.h"
 #include "vlu.h"