fix warning C4005: 'MAX_BITS': macro redefinition (compiling source f…

…ile ../../thirdparty/owemdjee/dcmtk/dcmimage/apps/dcmicmp.cc) : see previous definition of 'MAX_BITS' (compiling source file ../../thirdparty/owemdjee/dcmtk/dcmimage/apps/dcmicmp.cc)
GerHobbelt · Nov 26, 2024 · 4d5be2e · 4d5be2e
1 parent aed6541
commit 4d5be2e
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/dcmimgle/include/dcmtk/dcmimgle/diutils.h b/dcmimgle/include/dcmtk/dcmimgle/diutils.h
@@ -32,6 +32,13 @@
 
 #include "dcmtk/dcmimgle/didefine.h"
 
+// fix for MAX_BIS clash with zlib: make sure we've loaded zlib before we *re*define MAX_BITS further below!
+#ifdef WITH_ZLIB
+#include <zlib-ng.h>          /* for MAX_BITS */
+#endif
+
+#undef MAX_BITS
+
 extern DCMTK_DCMIMGLE_EXPORT OFLogger DCM_dcmimgleLogger;
 
 #define DCMIMGLE_TRACE(msg) OFLOG_TRACE(DCM_dcmimgleLogger, msg)