mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
Remove fdopen #defines in zutil.h.
|
|
|
|
fdopen() is not used by zlib anymore. The #defines are vestigial.
|
|
|
|
Fixes:
|
|
|
|
/Library/Developer/CommandLineTools/SDKs/MacOSX26.sdk/usr/include/_stdio.h:322:7: error: expected identifier or '('
|
|
322 | FILE *fdopen(int, const char *) __DARWIN_ALIAS_STARTING(__MAC_10_6, __IPHONE_2_0, __DARWIN_ALIAS(fdopen));
|
|
| ^
|
|
./../compat/zlib/zutil.h:147:33: note: expanded from macro 'fdopen'
|
|
147 | # define fdopen(fd,mode) NULL /* No fdopen() */
|
|
| ^
|
|
|
|
https://github.com/madler/zlib/commit/4bd9a71f3539b5ce47f0c67ab5e01f3196dc8ef9
|
|
--- compat/zlib/zutil.h.orig
|
|
+++ compat/zlib/zutil.h
|
|
@@ -137,17 +137,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
|
|
# endif
|
|
#endif
|
|
|
|
-#if defined(MACOS) || defined(TARGET_OS_MAC)
|
|
+#if defined(MACOS)
|
|
# define OS_CODE 7
|
|
-# ifndef Z_SOLO
|
|
-# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
|
|
-# include <unix.h> /* for fdopen */
|
|
-# else
|
|
-# ifndef fdopen
|
|
-# define fdopen(fd,mode) NULL /* No fdopen() */
|
|
-# endif
|
|
-# endif
|
|
-# endif
|
|
#endif
|
|
|
|
#ifdef __acorn
|
|
@@ -170,18 +161,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
|
|
# define OS_CODE 19
|
|
#endif
|
|
|
|
-#if defined(_BEOS_) || defined(RISCOS)
|
|
-# define fdopen(fd,mode) NULL /* No fdopen() */
|
|
-#endif
|
|
-
|
|
-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
|
|
-# if defined(_WIN32_WCE)
|
|
-# define fdopen(fd,mode) NULL /* No fdopen() */
|
|
-# else
|
|
-# define fdopen(fd,type) _fdopen(fd,type)
|
|
-# endif
|
|
-#endif
|
|
-
|
|
#if defined(__BORLANDC__) && !defined(MSDOS)
|
|
#pragma warn -8004
|
|
#pragma warn -8008
|