mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 06:56:14 +01:00
Merge branch 'mingw-arch' into 'master'
Fix arch detection ifdefs in glib/valgrind.h See merge request GNOME/glib!1429
This commit is contained in:
commit
b4d6849c83
@ -130,11 +130,11 @@
|
||||
# define PLAT_x86_darwin 1
|
||||
#elif defined(__APPLE__) && defined(__x86_64__)
|
||||
# define PLAT_amd64_darwin 1
|
||||
#elif (defined(__MINGW32__) && !defined(__MINGW64__)) \
|
||||
#elif (defined(__MINGW32__) && defined(__i386__)) \
|
||||
|| defined(__CYGWIN32__) \
|
||||
|| (defined(_WIN32) && defined(_M_IX86))
|
||||
# define PLAT_x86_win32 1
|
||||
#elif defined(__MINGW64__) \
|
||||
#elif (defined(__MINGW64__) && defined(__x86_64__)) \
|
||||
|| (defined(_WIN64) && defined(_M_X64))
|
||||
# define PLAT_amd64_win64 1
|
||||
#elif defined(__linux__) && defined(__i386__)
|
||||
|
Loading…
Reference in New Issue
Block a user