Skip to content

Commit 10787c6

Browse files
committed
Merge pull request opencv#8581 from ysolovyov:zlib-ios-fix
2 parents 9e054d3 + 26ccc09 commit 10787c6

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

modules/core/src/persistence.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,6 @@
5050

5151
#define USE_ZLIB 1
5252

53-
#ifdef __APPLE__
54-
# include "TargetConditionals.h"
55-
# if (defined TARGET_OS_IPHONE && TARGET_OS_IPHONE) || (defined TARGET_IPHONE_SIMULATOR && TARGET_IPHONE_SIMULATOR)
56-
# undef USE_ZLIB
57-
# define USE_ZLIB 0
58-
typedef void* gzFile;
59-
# endif
60-
#endif
61-
6253
#if USE_ZLIB
6354
# ifndef _LFS64_LARGEFILE
6455
# define _LFS64_LARGEFILE 0

0 commit comments

Comments
 (0)