coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2026-02-12 21:29:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

clangcl build fix for __cpuid in psnr util. Since clangcl provides the intrinsic thru its Visual C emulation, don't duplicately define the function with an inline version, which is normally needed for gcc/clang.

Browse Source 
BUG=412
TESTED=set GYP_DEFINES=clang=1 & gyp_libyuv -fninja libyuv_test.gyp
R=brucedawson@google.com

Review URL: https://webrtc-codereview.appspot.com/40339004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@1331 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2015-03-16 19:56:41 +00:00
parent f301777060
commit df90670aa5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/psnr.cc
View File

@ -206,7 +206,8 @@ static __inline void __cpuid(int cpu_info[4], int info_type) {
: "=a"(cpu_info[0]), "=D"(cpu_info[1]), "=c"(cpu_info[2]), "=d"(cpu_info[3]) : "=a"(cpu_info[0]), "=D"(cpu_info[1]), "=c"(cpu_info[2]), "=d"(cpu_info[3])
: "a"(info_type)); : "a"(info_type));
} }
#elif defined(__i386__) || defined(__x86_64__) // For gcc/clang but not clangcl.
#elif (defined(__i386__) || defined(__x86_64__)) && !defined(_MSC_VER)
static __inline void __cpuid(int cpu_info[4], int info_type) { static __inline void __cpuid(int cpu_info[4], int info_type) {
asm volatile ( // NOLINT asm volatile ( // NOLINT
"cpuid \n" "cpuid \n"