From 6393f2d3ff2cdb96c3fe3eef300903d878263b18 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Sun, 23 Oct 2022 17:13:44 +0200
Subject: Protect expat_config.h against multiple inclusion

---
 .github/workflows/data/expat_config_h_cmake__expected.txt | 1 +
 .github/workflows/data/expat_config_h_in__expected.txt    | 1 +
 expat/Changes                                             | 1 +
 expat/configure.ac                                        | 3 +++
 expat/expat_config.h.cmake                                | 5 +++++
 5 files changed, 11 insertions(+)

diff --git a/.github/workflows/data/expat_config_h_cmake__expected.txt b/.github/workflows/data/expat_config_h_cmake__expected.txt
index 036948ce..ea291955 100644
--- a/.github/workflows/data/expat_config_h_cmake__expected.txt
+++ b/.github/workflows/data/expat_config_h_cmake__expected.txt
@@ -1,3 +1,4 @@
+EXPAT_CONFIG_H
 BYTEORDER
 __func__
 HAVE_ARC4RANDOM
diff --git a/.github/workflows/data/expat_config_h_in__expected.txt b/.github/workflows/data/expat_config_h_in__expected.txt
index 3c23e8fc..32400327 100644
--- a/.github/workflows/data/expat_config_h_in__expected.txt
+++ b/.github/workflows/data/expat_config_h_in__expected.txt
@@ -1,3 +1,4 @@
+EXPAT_CONFIG_H
 AC_APPLE_UNIVERSAL_BUILD
 BYTEORDER
 const
diff --git a/expat/Changes b/expat/Changes
index fa4bab99..ea7d7e4c 100644
--- a/expat/Changes
+++ b/expat/Changes
@@ -12,6 +12,7 @@ Release x.x.x xxx xxxxxxxxxxxx xx xxxx
                     XML_ParserReset and then reused to parse
 
         Other changes:
+            #663  Protect header expat_config.h from multiple inclusion
             #648  Address compiler warnings
 
         Special thanks to:
diff --git a/expat/configure.ac b/expat/configure.ac
index 47216941..558f959f 100644
--- a/expat/configure.ac
+++ b/expat/configure.ac
@@ -86,6 +86,9 @@ LIBREVISION=9  # with
 LIBAGE=8       # CMakeLists.txt!
 
 AC_CONFIG_HEADERS([expat_config.h])
+AH_TOP([#ifndef EXPAT_CONFIG_H
+#define EXPAT_CONFIG_H 1])
+AH_BOTTOM([#endif // ndef EXPAT_CONFIG_H])
 
 AM_PROG_AR
 AC_PROG_INSTALL
diff --git a/expat/expat_config.h.cmake b/expat/expat_config.h.cmake
index ee4adc6d..78fcb4ca 100644
--- a/expat/expat_config.h.cmake
+++ b/expat/expat_config.h.cmake
@@ -1,5 +1,8 @@
 /* expat_config.h.cmake.  Based upon generated expat_config.h.in.  */
 
+#ifndef EXPAT_CONFIG_H
+#define EXPAT_CONFIG_H 1
+
 /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
 #cmakedefine BYTEORDER @BYTEORDER@
 
@@ -113,3 +116,5 @@
 
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #cmakedefine size_t @SIZE_T@
+
+#endif // ndef EXPAT_CONFIG_H
-- 
cgit v1.2.1