From 8bee9febea1221b5c7957214874a2f7b1a075ec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Mon, 27 Apr 2020 21:59:47 +0300 Subject: [PATCH] glib: Sync the local modification to glib/valgrind.h to what was upstreamed The local change from af0e0cb9950569828 in glib ended upstreamed as 7359c5fd9f312cddd62146896558d8c9bd2bd4cf in valgrind, with a few minor adjustments requested from there. Sync this local modification to what ended up upstreamed, to avoid any doubt regarding it for future syncs of the whole header. --- glib/valgrind.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/glib/valgrind.h b/glib/valgrind.h index ab76d41f3..a7f1f5655 100644 --- a/glib/valgrind.h +++ b/glib/valgrind.h @@ -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