Skip to content

Commit dbb594e

Browse files
authored
Merge pull request #1 from spotandjake/spotandjake-clang-17
feat: Patch `zutil` for macos clang 17
2 parents 91a2c36 + ccf989a commit dbb594e

2 files changed

Lines changed: 5 additions & 12 deletions

File tree

.github/workflows/test-build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ jobs:
1010
os:
1111
- windows-latest
1212
- macos-latest
13+
- macos-13
14+
- macos-15
1315
- ubuntu-latest
1416
runs-on: ${{ matrix.os }}
1517
steps:
16-
- uses: actions/setup-node@v3
18+
- uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
1719
with:
18-
node-version: 18
20+
node-version: 22
1921

2022
- name: Install esy
2123
run: |

Utilities/cmzlib/zutil.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,17 +137,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
137137
# endif
138138
#endif
139139

140-
#if defined(MACOS) || defined(TARGET_OS_MAC)
140+
#if defined(MACOS)
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

0 commit comments

Comments
 (0)