From e114b775bc17f3e2735d8ebfdf88ede6c201f341 Mon Sep 17 00:00:00 2001
From: donghee-na <donghee.na@linecorp.com>
Date: Fri, 15 Oct 2021 15:39:33 +0900
Subject: [PATCH] Reorder the location of including expat_config.h

---
 expat/lib/xmlparse.c  | 12 ++++++------
 expat/lib/xmlrole.c   |  4 ++--
 expat/lib/xmltok.c    |  8 ++++----
 expat/xmlwf/xmlfile.c | 12 ++++++------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 5ba56eae..f7ed9a05 100644
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -65,6 +65,12 @@
 #  endif
 #endif
 
+#ifdef _WIN32
+#  include "winconfig.h"
+#endif
+
+#include <expat_config.h>
+
 #include <stddef.h>
 #include <string.h> /* memset(), memcpy() */
 #include <assert.h>
@@ -86,12 +92,6 @@
 
 #define XML_BUILDING_EXPAT 1
 
-#ifdef _WIN32
-#  include "winconfig.h"
-#endif
-
-#include <expat_config.h>
-
 #include "ascii.h"
 #include "expat.h"
 #include "siphash.h"
diff --git a/expat/lib/xmlrole.c b/expat/lib/xmlrole.c
index 08173b0f..bd71134d 100644
--- a/expat/lib/xmlrole.c
+++ b/expat/lib/xmlrole.c
@@ -37,14 +37,14 @@
    USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <stddef.h>
-
 #ifdef _WIN32
 #  include "winconfig.h"
 #endif
 
 #include <expat_config.h>
 
+#include <stddef.h>
+
 #include "expat_external.h"
 #include "internal.h"
 #include "xmlrole.h"
diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c
index f2b6b406..5b935718 100644
--- a/expat/lib/xmltok.c
+++ b/expat/lib/xmltok.c
@@ -42,16 +42,16 @@
    USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <stddef.h>
-#include <string.h> /* memcpy */
-#include <stdbool.h>
-
 #ifdef _WIN32
 #  include "winconfig.h"
 #endif
 
 #include <expat_config.h>
 
+#include <stddef.h>
+#include <string.h> /* memcpy */
+#include <stdbool.h>
+
 #include "expat_external.h"
 #include "internal.h"
 #include "xmltok.h"
diff --git a/expat/xmlwf/xmlfile.c b/expat/xmlwf/xmlfile.c
index 50d02f8f..1824d432 100644
--- a/expat/xmlwf/xmlfile.c
+++ b/expat/xmlwf/xmlfile.c
@@ -36,18 +36,18 @@
    USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <fcntl.h>
-
 #ifdef _WIN32
 #  include "winconfig.h"
 #endif
 
 #include <expat_config.h>
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <fcntl.h>
+
 #include "expat.h"
 #include "internal.h" /* for UNUSED_P only */
 #include "xmlfile.h"
-- 
2.24.3 (Apple Git-128)