We actually don't need windows.h at all, and it makes both MinGW and VC++ unhappy because of conflicting macros (such as INT32 in jmorecfg.h)

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@511 632fc199-4ca6-4c93-a231-07263d6284db

rrutil.h

@@ -16,12 +16,10 @@
 #ifndef __RRUTIL_H__
 #define __RRUTIL_H__
 
-#ifdef _WIN32
-	#include <windows.h>
-	#ifndef __MINGW32__
-		#define snprintf(str, n, format, ...)  \
-			_snprintf_s(str, n, _TRUNCATE, format, __VA_ARGS__)
-	#endif
+#if defined(_WIN32) && !defined(__MINGW32__)
+	#include <stdio.h>
+	#define snprintf(str, n, format, ...)  \
+		_snprintf_s(str, n, _TRUNCATE, format, __VA_ARGS__)
 #else
 	#include <unistd.h>
 	#define stricmp strcasecmp