fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util/xmlconfig: Disable for Windows like Android

Browse source 
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>
This commit is contained in:
James Park 2020-08-06 19:48:39 -07:00 • committed by Marge Bot
parent fb56fb02a1
commit 6a189c89f8
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/util/meson.build
View file

@ -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

8
src/util/xmlconfig.c
View file

@ -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"