Skip to content

Commit d1717fa

Browse files
committed
zlib: Remove fdopen #defines.
This applies madler/zlib@4bd9a71 from upstream. fdopen() is not used by zlib anymore. The #defines are vestigial. This make the build with builtin zlib fails on lastest MacOS/XCode
1 parent 121dc61 commit d1717fa

File tree

1 file changed

+1
-26
lines changed

1 file changed

+1
-26
lines changed

builtins/zlib/zutil.h

+1-26
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
119119
# endif
120120
#endif
121121

122-
#if defined(MACOS) || defined(TARGET_OS_MAC)
122+
#if defined(MACOS)
123123
# define OS_CODE 0x07
124-
# ifndef Z_SOLO
125-
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
126-
# include <unix.h> /* for fdopen */
127-
# else
128-
# ifndef fdopen
129-
# define fdopen(fd,mode) NULL /* No fdopen() */
130-
# endif
131-
# endif
132-
# endif
133124
#endif
134125

135126
#ifdef TOPS20
@@ -146,22 +137,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
146137
# define OS_CODE 0x0f
147138
#endif
148139

149-
#if defined(_BEOS_) || defined(RISCOS)
150-
# define fdopen(fd,mode) NULL /* No fdopen() */
151-
#endif
152-
153-
#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
154-
# if defined(_WIN32_WCE)
155-
# define fdopen(fd,mode) NULL /* No fdopen() */
156-
# ifndef _PTRDIFF_T_DEFINED
157-
typedef int ptrdiff_t;
158-
# define _PTRDIFF_T_DEFINED
159-
# endif
160-
# else
161-
# define fdopen(fd,type) _fdopen(fd,type)
162-
# endif
163-
#endif
164-
165140
#if defined(__BORLANDC__) && !defined(MSDOS)
166141
#pragma warn -8004
167142
#pragma warn -8008

0 commit comments

Comments
 (0)