File tree Expand file tree Collapse file tree 2 files changed +14
-1
lines changed Expand file tree Collapse file tree 2 files changed +14
-1
lines changed Original file line number Diff line number Diff line change @@ -295,7 +295,7 @@ namespace embree
295
295
if (nIds >= 1 ) __cpuid (cpuid_leaf_1,0x00000001 );
296
296
#if _WIN32
297
297
#if _MSC_VER && (_MSC_FULL_VER < 160040219)
298
- #else
298
+ #elif defined(_MSC_VER)
299
299
if (nIds >= 7 ) __cpuidex (cpuid_leaf_7,0x00000007 ,0 );
300
300
#endif
301
301
#else
Original file line number Diff line number Diff line change
1
+ diff --git a/thirdparty/embree/common/sys/sysinfo.cpp b/thirdparty/embree/common/sys/sysinfo.cpp
2
+ index d01eab3c9d..4ecab05265 100644
3
+ --- a/thirdparty/embree/common/sys/sysinfo.cpp
4
+ +++ b/thirdparty/embree/common/sys/sysinfo.cpp
5
+ @@ -295,7 +295,7 @@ namespace embree
6
+ if (nIds >= 1) __cpuid (cpuid_leaf_1,0x00000001);
7
+ #if _WIN32
8
+ #if _MSC_VER && (_MSC_FULL_VER < 160040219)
9
+ - #else
10
+ + #elif defined(_MSC_VER)
11
+ if (nIds >= 7) __cpuidex(cpuid_leaf_7,0x00000007,0);
12
+ #endif
13
+ #else
You can’t perform that action at this time.
0 commit comments