Skip to content

Commit 447481e

Browse files
zmodemmarco-ippolito
authored andcommitted
deps: V8: cherry-pick third_party/zlib@646b7f569718
Original commit message: [zlib][build] Remove fdopen #defines in zutil.h. The latest version of Clang changed what macros it predefines on Apple targets, causing errors about predefined macros in zlib. See: madler/zlib@4bd9a71 Bug: 1519899 Change-Id: Ie75ef4078f2c86d89ba6c036ddd13e768a40ccbb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5237020 Reviewed-by: Adenilson Cavalcanti <cavalcantii@chromium.org> Commit-Queue: Hans Wennborg <hans@chromium.org> Cr-Commit-Position: refs/heads/main@{#1253252} NOKEYCHECK=True GitOrigin-RevId: 2f39ac8d0a414dd65c0e1d5aae38c8f97aa06ae9 Refs: https://chromium.googlesource.com/chromium/src/third_party/zlib/+/646b7f569718921d7d4b5b8e22572ff6c76f2596 PR-URL: #58342 Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
1 parent 1521125 commit 447481e

File tree

2 files changed

+2
-23
lines changed

2 files changed

+2
-23
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.26',
39+
'v8_embedder_string': '-node.27',
4040

4141
##### V8 defaults for Node.js #####
4242

deps/v8/third_party/zlib/zutil.h

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -152,17 +152,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
152152
# endif
153153
#endif
154154

155-
#if defined(MACOS) || defined(TARGET_OS_MAC)
155+
#if defined(MACOS)
156156
# define OS_CODE 7
157-
# ifndef Z_SOLO
158-
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
159-
# include <unix.h> /* for fdopen */
160-
# else
161-
# ifndef fdopen
162-
# define fdopen(fd,mode) NULL /* No fdopen() */
163-
# endif
164-
# endif
165-
# endif
166157
#endif
167158

168159
#ifdef __acorn
@@ -185,18 +176,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
185176
# define OS_CODE 19
186177
#endif
187178

188-
#if defined(_BEOS_) || defined(RISCOS)
189-
# define fdopen(fd,mode) NULL /* No fdopen() */
190-
#endif
191-
192-
#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
193-
# if defined(_WIN32_WCE)
194-
# define fdopen(fd,mode) NULL /* No fdopen() */
195-
# else
196-
# define fdopen(fd,type) _fdopen(fd,type)
197-
# endif
198-
#endif
199-
200179
#if defined(__BORLANDC__) && !defined(MSDOS)
201180
#pragma warn -8004
202181
#pragma warn -8008

0 commit comments

Comments
 (0)