AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'msvc-fix' into 'master'

Browse Source 
Fix illegal instruction crash on x64 CPUs without POPCNT instruction when compiled with MSVC

See merge request GNOME/gtk!3664
This commit is contained in:
Matthias Clasen 2021-06-13 11:38:22 +00:00
commit 65212535df
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkpopcountprivate.h
View File

@ -20,7 +20,7 @@
#pragma once
#if defined(_MSC_VER) && !defined (_M_ARM) && !defined (_M_ARM64)
#if (defined(_MSC_VER) && !_M_ARM && !_M_ARM64) && (__AVX__ || __SSE4_2__ || __POPCNT__)
#include <intrin.h>
static inline guint
@ -29,7 +29,7 @@ gtk_popcount (guint32 value)
return __popcnt (value);
}
#elif defined(__GNUC__) || defined(__clang__)
# define gtk_popcount(v) __builtin_popcount(v)
#define gtk_popcount(v) __builtin_popcount (v)
#else
static inline guint
gtk_popcount (guint32 value)