Import Geant4 11.3.2 source tree

source/externals/g4tools/History

@@ -6,6 +6,10 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2025-04-07 Gabriele Cosmo (g4tools-V11-02-06)
+- Fixed compilation errors on Windows in glarea header, triggered when enabling
+  GL WIN32 support, as reported in problem report #2599.
+
 ## 2024-10-24 Guy Barrand (g4tools-V11-02-05)
 - wroot/file: in compress_buffer(): to fix bugzilla-2625: arrange to have a greater
   output buffer size when using deflate(), and check at end, that in case of some

source/externals/g4tools/include/toolx/Windows/glarea

@@ -50,8 +50,8 @@ class glarea {
       wc.hIcon         = LoadIcon(NULL,IDI_APPLICATION);
       wc.hCursor       = LoadCursor(NULL,IDC_ARROW);
       wc.hbrBackground = GetSysColorBrush(COLOR_BTNFACE);
-      wc.lpszMenuName  = s_class().c_str();
-      wc.lpszClassName = s_class().c_str();
+      wc.lpszMenuName  = (PTSTR)s_class().c_str();
+      wc.lpszClassName = (PTSTR)s_class().c_str();
       ::RegisterClass(&wc);
       s_done = true;
     }
@@ -79,7 +79,7 @@ public:
     ::GetClientRect(m_parent,&rect);
     //printf("debug : glarea : ca : %d %d\n",rect.right-rect.left,rect.bottom-rect.top);
     //toolx::log_file::get().writef("debug : glarea : ca : %d %d\n",rect.right-rect.left,rect.bottom-rect.top);
-    m_hwnd = ::CreateWindow(s_class().c_str(),
+    m_hwnd = ::CreateWindow((PTSTR)s_class().c_str(),
                              NULL,
                              WS_CHILD | WS_VISIBLE,
                              0,0,
@@ -135,7 +135,7 @@ protected:
     register_class();
     RECT rect;
     ::GetClientRect(m_parent,&rect);
-    m_hwnd = ::CreateWindow(s_class().c_str(),
+    m_hwnd = ::CreateWindow((PTSTR)s_class().c_str(),
                              NULL,
                              WS_CHILD | WS_VISIBLE,
                              0,0,

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