From ef88be6548e6c53d8923fa749682c7d543b00630 Mon Sep 17 00:00:00 2001 From: Peter Petrik Date: Thu, 23 Jul 2020 15:53:38 +0200 Subject: [PATCH] fix build on macos and clang when zip.h is present on system from zlib library --- src/decode.c | 2 +- src/encode.c | 2 +- src/libImaging/ZipDecode.c | 2 +- src/libImaging/ZipEncode.c | 2 +- src/libImaging/{Zip.h => ZipState.h} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename src/libImaging/{Zip.h => ZipState.h} (100%) diff --git a/src/decode.c b/src/decode.c index 25ce7316b..3d7eb5eab 100644 --- a/src/decode.c +++ b/src/decode.c @@ -807,7 +807,7 @@ PyImaging_XbmDecoderNew(PyObject* self, PyObject* args) #ifdef HAVE_LIBZ -#include "Zip.h" +#include "ZipState.h" PyObject* PyImaging_ZipDecoderNew(PyObject* self, PyObject* args) diff --git a/src/encode.c b/src/encode.c index d64f47d2b..e9a344187 100644 --- a/src/encode.c +++ b/src/encode.c @@ -578,7 +578,7 @@ PyImaging_XbmEncoderNew(PyObject* self, PyObject* args) #ifdef HAVE_LIBZ -#include "Zip.h" +#include "ZipState.h" PyObject* PyImaging_ZipEncoderNew(PyObject* self, PyObject* args) diff --git a/src/libImaging/ZipDecode.c b/src/libImaging/ZipDecode.c index b0f8ad326..f9b12db70 100644 --- a/src/libImaging/ZipDecode.c +++ b/src/libImaging/ZipDecode.c @@ -20,7 +20,7 @@ #ifdef HAVE_LIBZ -#include "Zip.h" +#include "ZipState.h" static const int OFFSET[] = { 7, 3, 3, 1, 1, 0, 0 }; static const int STARTING_COL[] = { 0, 4, 0, 2, 0, 1, 0 }; diff --git a/src/libImaging/ZipEncode.c b/src/libImaging/ZipEncode.c index 84ccb14ea..67b7acbf8 100644 --- a/src/libImaging/ZipEncode.c +++ b/src/libImaging/ZipEncode.c @@ -19,7 +19,7 @@ #ifdef HAVE_LIBZ -#include "Zip.h" +#include "ZipState.h" int ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes) diff --git a/src/libImaging/Zip.h b/src/libImaging/ZipState.h similarity index 100% rename from src/libImaging/Zip.h rename to src/libImaging/ZipState.h