[OMPT-svn-commit] OpenMPT r25748 - in branches/OpenMPT-1.29: . include/zlib

[<sv...@op...>]

Author: manx
Date: Sat Oct  3 16:21:34 2026
New Revision: 25748
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25748

Log:
Merged revision(s) 25744 from trunk/OpenMPT:
[Fix] zlib: Apply <https://github.com/madler/zlib/commit/a82e0db392178a3e05fb27bf551a6ce757a47898>.
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/include/zlib/OpenMPT.txt
   branches/OpenMPT-1.29/include/zlib/gzguts.h

Modified: branches/OpenMPT-1.29/include/zlib/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.29/include/zlib/OpenMPT.txt	Sat Oct  3 16:21:15 2026	(r25747)
+++ branches/OpenMPT-1.29/include/zlib/OpenMPT.txt	Sat Oct  3 16:21:34 2026	(r25748)
@@ -1,9 +1,11 @@
 zlib 1.3.2. (zlib-1.3.2.tar.gz)
 Files not required by OpenMPT have been removed.
 OpenMPT specific changes:
- *  Commit
+ *  Commits
     <https://github.com/madler/zlib/commit/813dac5dcb5902ed241e9b0d38abd2d847a335a9>
-    has been applied to fix <https://github.com/madler/zlib/issues/1168>.
+    , and
+    <https://github.com/madler/zlib/commit/a82e0db392178a3e05fb27bf551a6ce757a47898>
+    have been applied to fix <https://github.com/madler/zlib/issues/1168>.
  *  `zconf.h` has been modified to avoid preprocessor warnings. See
     <https://github.com/madler/zlib/issues/1169>.
  *  `contrib/minizip/iowin32.c` has been modified to only use Windows 8 WinRT

Modified: branches/OpenMPT-1.29/include/zlib/gzguts.h
==============================================================================
--- branches/OpenMPT-1.29/include/zlib/gzguts.h	Sat Oct  3 16:21:15 2026	(r25747)
+++ branches/OpenMPT-1.29/include/zlib/gzguts.h	Sat Oct  3 16:21:34 2026	(r25748)
@@ -103,20 +103,6 @@
 #  endif
 #endif
 
-#ifdef EAGAIN
-#  ifdef EWOULDBLOCK
-#    define BLOCKED(e) ((e) == EAGAIN || (e) == EWOULDBLOCK)
-#  else
-#    define BLOCKED(e) ((e) == EAGAIN)
-#  endif
-#else
-#  ifdef EWOULDBLOCK
-#    define BLOCKED(e) ((e) == EWOULDBLOCK)
-#  else
-#    define BLOCKED(e) (0)
-#  endif
-#endif
-
 /* unlike snprintf (which is required in C99), _snprintf does not guarantee
    null termination of the result -- however this is only used in gzlib.c where
    the result is assured to fit in the space provided */
@@ -150,6 +136,20 @@
 #  endif
 #endif
 
+#ifdef EAGAIN
+#  ifdef EWOULDBLOCK
+#    define BLOCKED(e) ((e) == EAGAIN || (e) == EWOULDBLOCK)
+#  else
+#    define BLOCKED(e) ((e) == EAGAIN)
+#  endif
+#else
+#  ifdef EWOULDBLOCK
+#    define BLOCKED(e) ((e) == EWOULDBLOCK)
+#  else
+#    define BLOCKED(e) (0)
+#  endif
+#endif
+
 /* provide prototypes for these when building zlib without LFS */
 #if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
     ZEXTERN gzFile ZEXPORT gzopen64(const char *, const char *);