1+ --- a/3rdparty/libpng/pngpriv.h
2+ +++ b/3rdparty/libpng/pngpriv.h
3+ @@ -214,7 +214,7 @@
4+ # endif
5+ #endif
6+
7+ - #if PNG_INTEL_SSE_OPT > 0
8+ + #if defined(PNG_INTEL_SSE_OPT) && PNG_INTEL_SSE_OPT > 0
9+ # ifndef PNG_INTEL_SSE_IMPLEMENTATION
10+ # if defined(__SSE4_1__) || defined(__AVX__)
11+ /* We are not actually using AVX, but checking for AVX is the best
12+ @@ -547,7 +547,7 @@
13+
14+ /* Memory model/platform independent fns */
15+ #ifndef PNG_ABORT
16+ - # ifdef _WINDOWS_
17+ + # if defined(_WINDOWS_) && !defined(WINRT)
18+ # define PNG_ABORT() ExitProcess(0)
19+ # else
20+ # define PNG_ABORT() abort()
21+ @@ -1340,7 +1340,7 @@ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_vsx,(png_row_infop
22+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
23+ #endif
24+
25+ - #if PNG_INTEL_SSE_IMPLEMENTATION > 0
26+ + #if defined(PNG_INTEL_SSE_IMPLEMENTATION) && PNG_INTEL_SSE_IMPLEMENTATION > 0
27+ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_sse2,(png_row_infop
28+ row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
29+ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_sse2,(png_row_infop
30+ @@ -2099,7 +2099,7 @@ PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_msa,
31+ (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
32+ #endif
33+
34+ - # if PNG_INTEL_SSE_IMPLEMENTATION > 0
35+ + # if defined(PNG_INTEL_SSE_IMPLEMENTATION) && PNG_INTEL_SSE_IMPLEMENTATION > 0
36+ PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_sse2,
37+ (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
38+ # endif
0 commit comments