Merge pull request #8581 from ysolovyov:zlib-ios-fix

8 years ago · 10787c68d0
parent 9e054d3880 26ccc09c46
commit 10787c68d0
1 changed files with 0 additions and 9 deletions
--- a/modules/core/src/persistence.cpp
+++ b/modules/core/src/persistence.cpp
@ -50,15 +50,6 @@

 #define USE_ZLIB 1

-#ifdef __APPLE__
-#  include "TargetConditionals.h"
-#  if (defined TARGET_OS_IPHONE && TARGET_OS_IPHONE) || (defined TARGET_IPHONE_SIMULATOR && TARGET_IPHONE_SIMULATOR)
-#    undef USE_ZLIB
-#    define USE_ZLIB 0
-     typedef void* gzFile;
-#  endif
-#endif
-
 #if USE_ZLIB
 #  ifndef _LFS64_LARGEFILE
 #    define _LFS64_LARGEFILE 0