From 921eebdbeac0972d08870c652eab2848aec98dcd Mon Sep 17 00:00:00 2001
From: Jakub Karolczyk <jakub.karolczyk@signalwire.com>
Date: Tue, 4 Jul 2023 10:42:38 +0100
Subject: [PATCH] [xmlrpc-c] Fix MacOS build

---
 libs/xmlrpc-c/include/xmlrpc-c/string_int.h | 5 +++++
 libs/xmlrpc-c/lib/abyss/src/server.c        | 3 +++
 libs/xmlrpc-c/lib/abyss/src/thread_fork.c   | 4 ++++
 libs/xmlrpc-c/lib/libutil/asprintf.c        | 3 +++
 4 files changed, 15 insertions(+)

diff --git a/libs/xmlrpc-c/include/xmlrpc-c/string_int.h b/libs/xmlrpc-c/include/xmlrpc-c/string_int.h
index 04ac8c782b..a0cc58605f 100644
--- a/libs/xmlrpc-c/include/xmlrpc-c/string_int.h
+++ b/libs/xmlrpc-c/include/xmlrpc-c/string_int.h
@@ -3,7 +3,12 @@
 
 
 #include <stdarg.h>
+
+#ifdef __APPLE__
+#include <strings.h>
+#else
 #include <string.h>
+#endif
 
 #include "xmlrpc_config.h"
 #include "c_util.h"
diff --git a/libs/xmlrpc-c/lib/abyss/src/server.c b/libs/xmlrpc-c/lib/abyss/src/server.c
index 6337dcfd78..ca05011b83 100644
--- a/libs/xmlrpc-c/lib/abyss/src/server.c
+++ b/libs/xmlrpc-c/lib/abyss/src/server.c
@@ -1,6 +1,9 @@
 /* Copyright information is at end of file */
 
 #define _XOPEN_SOURCE 600  /* Make sure strdup() is in <string.h> */
+#ifdef __APPLE__
+#define _DARWIN_C_SOURCE
+#endif
 #define _BSD_SOURCE  /* Make sure setgroups()is in <grp.h> */
 #ifndef _DEFAULT_SOURCE
 #define _DEFAULT_SOURCE
diff --git a/libs/xmlrpc-c/lib/abyss/src/thread_fork.c b/libs/xmlrpc-c/lib/abyss/src/thread_fork.c
index d96bf59eb1..7ea382918a 100644
--- a/libs/xmlrpc-c/lib/abyss/src/thread_fork.c
+++ b/libs/xmlrpc-c/lib/abyss/src/thread_fork.c
@@ -3,7 +3,11 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
+#ifdef __APPLE__
+#include <sys/wait.h>
+#else
 #include <wait.h>
+#endif
 #include <signal.h>
 
 #include "xmlrpc_config.h"
diff --git a/libs/xmlrpc-c/lib/libutil/asprintf.c b/libs/xmlrpc-c/lib/libutil/asprintf.c
index b52523065a..f078518bb5 100644
--- a/libs/xmlrpc-c/lib/libutil/asprintf.c
+++ b/libs/xmlrpc-c/lib/libutil/asprintf.c
@@ -1,4 +1,7 @@
 #define _XOPEN_SOURCE 600  /* Make sure strdup() is in <string.h> */
+#ifdef __APPLE__
+#define _DARWIN_C_SOURCE
+#endif
 #ifndef _GNU_SOURCE
 	#define _GNU_SOURCE  /* But only when HAVE_ASPRINTF */
 #endif