--- src/lib-master/test-event-stats.c.orig	2019-02-22 17:27:55.996934000 -0700
+++ src/lib-master/test-event-stats.c	2019-02-22 17:32:00.455939000 -0700
@@ -13,6 +13,7 @@
 #include "test-common.h"
 #include <fcntl.h>
 #include <unistd.h>
+#include <signal.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>
@@ -360,7 +361,7 @@
 	event_unref(&child_ev);
 	test_assert(
 		compare_test_stats_to(
-			"EVENT	%lu	1	0	0"
+			"EVENT	%"PRIu64"	1	0	0"
 			"	stest-event-stats.c	%d"
 			"	l0	0	ctest2\n", id, l));
 	test_end();
@@ -386,12 +387,12 @@
 	event_unref(&child_ev);
 	test_assert(
 		compare_test_stats_to(
-			"BEGIN	%lu	0	1	0	0"
+			"BEGIN	%"PRIu64"	0	1	0	0"
 			"	stest-event-stats.c	%d	ctest1\n"
-			"EVENT	%lu	1	1	0"
+			"EVENT	%"PRIu64"	1	1	0"
 			"	stest-event-stats.c	%d"
 			"	l1	0	ctest2\n"
-			"END\t%lu\n", idp, lp, idp, l, idp));
+			"END\t%"PRIu64"\n", idp, lp, idp, l, idp));
 	test_end();
 }
 
@@ -451,7 +452,7 @@
 	event_unref(&merge_ev2);
 	test_assert(
 		compare_test_stats_to(
-			"EVENT	%lu	1	0	0"
+			"EVENT	%"PRIu64"	1	0	0"
 			"	stest-event-stats.c	%d	l0	0"
 			"	ctest3	ctest2	ctest1	Tkey3"
 			"	10	0	Ikey2	20"
@@ -483,11 +484,11 @@
 	event_unref(&child_ev);
 	test_assert(
 		compare_test_stats_to(
-			"BEGIN	%lu	0	1	0	0"
+			"BEGIN	%"PRIu64"	0	1	0	0"
 			"	stest-event-stats.c	%d	ctest1\n"
-			"EVENT	%lu	1	3	0	"
+			"EVENT	%"PRIu64"	1	3	0	"
 			"stest-event-stats.c	%d	l3	0"
-			"	ctest2\nEND\t%lu\n", id, lp, id, l, id));
+			"	ctest2\nEND\t%"PRIu64"\n", id, lp, id, l, id));
 	test_end();
 }
 
@@ -525,12 +526,12 @@
 	event_unref(&child2_ev);
 	test_assert(
 		compare_test_stats_to(
-			"BEGIN	%lu	0	1	0	0"
+			"BEGIN	%"PRIu64"	0	1	0	0"
 			"	stest-event-stats.c	%d	ctest1\n"
-			"EVENT	%lu	1	3	0	"
+			"EVENT	%"PRIu64"	1	3	0	"
 			"stest-event-stats.c	%d	l3	0	"
 			"ctest4	ctest5	Tkey3	10	0	Skey4"
-			"	str4\nEND\t%lu\n", id, lp, id, l, id));
+			"	str4\nEND\t%"PRIu64"\n", id, lp, id, l, id));
 	test_end();
 }