util/xmlconfig: Disable for Windows like Android

The code does not compile on Windows, so just disable for now. There is
already a pattern to do this for Android.

Stop including expat dependency if building Windows.

Disable WITH_XMLCONFIG if _WIN32 is defined.

Tuck _WIN32 incompatible includes inside WITH_XMLCONFIG.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7249>

diff --git a/src/util/meson.build b/src/util/meson.build
index f38b725..a820675 100644 (file)
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -200,7 +200,7 @@ idep_mesautil = declare_dependency(
 )
 
 xmlconfig_deps = []
-if not with_platform_android
+if not (with_platform_android or with_platform_windows)
   xmlconfig_deps += dep_expat
 endif
 

diff --git a/src/util/xmlconfig.c b/src/util/xmlconfig.c
index 4bd5339..0245f8f 100644 (file)
--- a/src/util/xmlconfig.c
+++ b/src/util/xmlconfig.c
@@ -27,7 +27,7 @@
  * \author Felix Kuehling
  */
 
-#ifdef ANDROID
+#if defined(ANDROID) || defined(_WIN32)
 #define WITH_XMLCONFIG 0
 #else
 #define WITH_XMLCONFIG 1
@@ -43,14 +43,14 @@
 #include <assert.h>
 #if WITH_XMLCONFIG
 #include <expat.h>
-#endif
-#include <fcntl.h>
-#include <math.h>
 #include <unistd.h>
 #include <errno.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <regex.h>
+#endif
+#include <fcntl.h>
+#include <math.h>
 #include "strndup.h"
 #include "xmlconfig.h"
 #include "u_process.h"