diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-07-19 17:00:09 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-19 17:00:09 -0300 |
| commit | 89588d43349e496a9e05756d42ae87323d31269e (patch) | |
| tree | 6fb8bd1bdf5b7b12e2b71ff715060182f07723b8 /thirdparty | |
| parent | 45b498c4e056e313e06b169d64f991b32db30423 (diff) | |
| parent | fbb27a0c43cb524b1bea79a3dad0e2f86a817b06 (diff) | |
Merge pull request #9722 from endragor/fix-android-export
Fix android export templates build
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/libpng/pngpriv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/thirdparty/libpng/pngpriv.h b/thirdparty/libpng/pngpriv.h index a062a8da16..77d30420a5 100644 --- a/thirdparty/libpng/pngpriv.h +++ b/thirdparty/libpng/pngpriv.h @@ -464,7 +464,7 @@ static_cast<type>(static_cast<void*>(value)) # define png_aligncastconst(type, value) \ static_cast<type>(static_cast<const void*>(value)) -#else +#elif !defined(__ASSEMBLER__) # define png_voidcast(type, value) (value) # ifdef _WIN64 # ifdef __GNUC__ |