Merge branch 'master' into ti

This commit is contained in:
toddouska
2014-05-19 14:34:46 -07:00

View File

@ -1566,7 +1566,7 @@ static const word32 Td[5][256] = {
#else #else
#include <intrin.h> #include <intrin.h>
#define cpuid(a,b) __cpuid(a,b) #define cpuid(a,b) __cpuid((int*)a,b)
#define XASM_LINK(f) #define XASM_LINK(f)