luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mingw-arch' into 'master'

Browse Source 
Fix arch detection ifdefs in glib/valgrind.h

See merge request GNOME/glib!1429
This commit is contained in:
Sebastian Dröge 2020-04-01 11:58:39 +00:00
commit b4d6849c83
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/valgrind.h
View File

@ -130,11 +130,11 @@
# define PLAT_x86_darwin 1 # define PLAT_x86_darwin 1
#elif defined(__APPLE__) && defined(__x86_64__) #elif defined(__APPLE__) && defined(__x86_64__)
# define PLAT_amd64_darwin 1 # define PLAT_amd64_darwin 1
#elif (defined(__MINGW32__) && !defined(__MINGW64__)) \ #elif (defined(__MINGW32__) && defined(__i386__)) \
|| defined(__CYGWIN32__) \ || defined(__CYGWIN32__) \
|| (defined(_WIN32) && defined(_M_IX86)) || (defined(_WIN32) && defined(_M_IX86))
# define PLAT_x86_win32 1 # define PLAT_x86_win32 1
#elif defined(__MINGW64__) \ #elif (defined(__MINGW64__) && defined(__x86_64__)) \
|| (defined(_WIN64) && defined(_M_X64)) || (defined(_WIN64) && defined(_M_X64))
# define PLAT_amd64_win64 1 # define PLAT_amd64_win64 1
#elif defined(__linux__) && defined(__i386__) #elif defined(__linux__) && defined(__i386__)