deps/jpeg-6b: Patch for header conflicts

diff --git a/deps/jpeg-6b/jmorecfg.h b/deps/jpeg-6b/jmorecfg.h
index 54a7d1c..ae157ae 100644 (file)
--- a/deps/jpeg-6b/jmorecfg.h
+++ b/deps/jpeg-6b/jmorecfg.h
@@ -157,7 +157,7 @@ typedef short INT16;
 
 /* INT32 must hold at least signed 32-bit values. */
 
-#ifndef XMD_H                  /* X11/xmd.h correctly defines INT32 */
+#if !defined(XMD_H) && (!defined(_BASETSD_H_) || !defined(__MINGW32__))                        /* X11/xmd.h correctly defines INT32 */
 typedef long INT32;
 #endif