Skip to content

Commit 2f5b3fd

Browse files
committed
prevent errors related to fdopen if gcc/binutils try to use their built-in zlib on macos
1 parent 9a644fb commit 2f5b3fd

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

binutils/zlib/zutil.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
139139

140140
#if defined(MACOS) || defined(TARGET_OS_MAC)
141141
# define OS_CODE 7
142-
# ifndef Z_SOLO
143-
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
144-
# include <unix.h> /* for fdopen */
145-
# else
146-
# ifndef fdopen
147-
# define fdopen(fd,mode) NULL /* No fdopen() */
148-
# endif
149-
# endif
150-
# endif
151142
#endif
152143

153144
#ifdef __acorn

gcc/zlib/zutil.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
132132

133133
#if defined(MACOS) || defined(TARGET_OS_MAC)
134134
# define OS_CODE 7
135-
# ifndef Z_SOLO
136-
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
137-
# include <unix.h> /* for fdopen */
138-
# else
139-
# ifndef fdopen
140-
# define fdopen(fd,mode) NULL /* No fdopen() */
141-
# endif
142-
# endif
143-
# endif
144135
#endif
145136

146137
#ifdef __acorn

0 commit comments

Comments
 (0)