From 0bae769f78d6c0aae81a792154d9b3506710b646 Mon Sep 17 00:00:00 2001
From: Antonio Caggiano <quic_acaggian@quicinc.com>
Date: Mon, 12 Aug 2024 11:41:19 +0200
Subject: [PATCH] lib: Fix environ on MacOS

On macOS, environ is not declared. Use the workaround suggested here:
https://www.gnu.org/software/gnulib/manual/html_node/environ.html

Signed-off-by: Antonio Caggiano <quic_acaggian@quicinc.com>
---
 lib/guestfs-internal.h | 5 +++++
 lib/handle.c           | 1 +
 2 files changed, 6 insertions(+)

diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h
index 57f0eb173..174ca135f 100644
--- a/lib/guestfs-internal.h
+++ b/lib/guestfs-internal.h
@@ -26,6 +26,11 @@
 #ifndef GUESTFS_INTERNAL_H_
 #define GUESTFS_INTERNAL_H_
 
+#ifdef __APPLE__
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+#endif // __APPLE__
+
 #include <stdbool.h>
 #include <assert.h>
 
diff --git a/lib/handle.c b/lib/handle.c
index f1f33e737..df8e4284f 100644
--- a/lib/handle.c
+++ b/lib/handle.c
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <libintl.h>
+#include <errno.h>
 
 #include <libxml/parser.h>
 #include <libxml/xmlversion.h>