Ignore:
Timestamp:
Dec 28, 2016 5:20:16 AM (8 years ago)
Author:
riza
Message:

Re #1900: Fix merge conflict for solution file and project files. And fix some compile error found for UWP.

Location:
pjproject/branches/projects/uwp
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • pjproject/branches/projects/uwp

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • pjproject/branches/projects/uwp/third_party/yuv/source/cpu_id.cc

    r5358 r5514  
    168168// Test environment variable for disabling CPU features. Any non-zero value 
    169169// to disable. Zero ignored to make it easy to set the variable on/off. 
    170 #if !defined(__native_client__) && !defined(_M_ARM) 
     170#if !defined(__native_client__) && !defined(_M_ARM) && !defined(_MSC_VER) 
    171171 
    172172static LIBYUV_BOOL TestEnv(const char* name) { 
Note: See TracChangeset for help on using the changeset viewer.