Import Geant4 11.3.2 source tree

source/externals/zlib/History

@@ -1,8 +1,14 @@
 # Category zlib History
 
 See `CONTRIBUTING.rst` for details of **required** info/format for each entry,
-which **must** added in reverse chronological order (newest at the top). It must **not**
-be used as a substitute for writing good git commit messages!
+which **must** added in reverse chronological order (newest at the top).
+It must **not** be used as a substitute for writing good git commit messages!
+
+-------------------------------------------------------------------------------
+
+## 2025-04-01 Gabriele Cosmo (zlib-V11-02-00)
+- Fix in zutil.h to remove redundant block on macOS and allow for porting
+  on macOS-15.4 and clang-17.0.0.
 
 ## 2023-06-15 Ben Morgan (zlib-V11-01-00)
 - Import zlib 1.2.13 sources, retaining prior Geant4 patches.

source/externals/zlib/include/zutil.h

@@ -137,19 +137,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-#  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
 #  define OS_CODE 13
 #endif