--- win/jconfig.h.in.orig	2011-06-03 20:17:01.918582804 +0200
+++ win/jconfig.h.in	2011-06-03 20:19:23.622100937 +0200
@@ -25,7 +25,14 @@
 #endif
 #define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
 
+/* Define "INT32" as int, not long, per Windows custom */
+#if !(defined(_BASETSD_H_) || defined(_BASETSD_H))   /* don't conflict if basetsd.h already read */
+typedef short INT16;
+typedef signed int INT32;
+#endif
+#define XMD_H                   /* prevent jmorecfg.h from redefining it */
+
 #define inline __inline
 
 #ifdef JPEG_INTERNALS