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

Fix Visual Studio Build Since a080cb4

Browse Source 
The patch did not check for Visual Studio 2008 correctly, plus it
would break the build on later Visual Studio versions, as it should
be __popcnt(), not __popcount().  Fix that.
This commit is contained in:
Chun-wei Fan 2015-09-23 23:24:36 +08:00
parent a080cb40b9
commit ac62479c9e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkcssselector.c
View File

@ -25,9 +25,8 @@
#include "gtkcssprovider.h" #include "gtkcssprovider.h"
#include "gtkstylecontextprivate.h" #include "gtkstylecontextprivate.h"
#if defined(_MSC_VER) && _MSC_VER > 1500 #if defined(_MSC_VER) && _MSC_VER >= 1500
# include <intrin.h> # include <intrin.h>
# define __builtin_popcount(n) __popcount(n)
#endif #endif
typedef struct _GtkCssSelectorClass GtkCssSelectorClass; typedef struct _GtkCssSelectorClass GtkCssSelectorClass;
@ -758,8 +757,8 @@ count_bits (guint n)
return (guint) __builtin_popcount (n); return (guint) __builtin_popcount (n);
#elif defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 1)) #elif defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 1))
return (guint) __builtin_popcount (n); return (guint) __builtin_popcount (n);
#elif defined(_MSC_VER) && _MSC_VER > 1500 #elif defined(_MSC_VER) && _MSC_VER >= 1500
return (guint) __builtin_popcount (n); return (guint) __popcnt (n);
#else #else
guint result = 0; guint result = 0;