Merge branch 'valgrind-header-sync' into 'master'

glib: Sync the local modification to glib/valgrind.h to what was upstreamed

See merge request GNOME/glib!1460
This commit is contained in:
Philip Withnall 2020-05-01 16:34:45 +00:00
commit 8a8de39b81

View File

@ -134,8 +134,9 @@
|| defined(__CYGWIN32__) \
|| (defined(_WIN32) && defined(_M_IX86))
# define PLAT_x86_win32 1
#elif (defined(__MINGW64__) && defined(__x86_64__)) \
|| (defined(_WIN64) && defined(_M_X64))
#elif (defined(__MINGW32__) && defined(__x86_64__)) \
|| (defined(_WIN32) && defined(_M_X64))
/* __MINGW32__ and _WIN32 are defined in 64 bit mode as well. */
# define PLAT_amd64_win64 1
#elif defined(__linux__) && defined(__i386__)
# define PLAT_x86_linux 1