diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/codec/SkCodec_libpng.h | 8 | ||||
| -rw-r--r-- | src/images/SkImageDecoder_libpng.cpp | 7 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/codec/SkCodec_libpng.h b/src/codec/SkCodec_libpng.h index 527efb75b7..8e43818204 100644 --- a/src/codec/SkCodec_libpng.h +++ b/src/codec/SkCodec_libpng.h @@ -12,11 +12,9 @@ #include "SkRefCnt.h" #include "SkSwizzler.h" -#ifdef SKIA_PNG_PREFIXED - // this must proceed png.h - #include "pngprefix.h" -#endif -#include "png.h" +extern "C" { + #include "png.h" +} class SkScanlineDecoder; class SkStream; diff --git a/src/images/SkImageDecoder_libpng.cpp b/src/images/SkImageDecoder_libpng.cpp index 44aa8e2e64..4101b3e4ec 100644 --- a/src/images/SkImageDecoder_libpng.cpp +++ b/src/images/SkImageDecoder_libpng.cpp @@ -17,12 +17,9 @@ #include "SkTemplates.h" #include "SkUtils.h" #include "transform_scanline.h" - -#ifdef SKIA_PNG_PREFIXED - // this must proceed png.h - #include "pngprefix.h" -#endif +extern "C" { #include "png.h" +} /* These were dropped in libpng >= 1.4 */ #ifndef png_infopp_NULL |