diff -ur -x *.manifest -x *.map C:\FGCVS\tidy\console\tidy.c tidy4p5\console\tidy.c
--- C:\FGCVS\tidy\console\tidy.c	Sat Mar 29 13:59:04 2008
+++ tidy4p5\console\tidy.c	Sat Jul 26 13:08:04 2008
@@ -477,6 +477,7 @@
     fprintf(stderr, "Fatal error: impossible value for id='%d'.\n", (int)id);
     assert(0);
     abort();
+    return "uncased";
 }
 
 /* Description of an option */
diff -ur -x *.manifest -x *.map C:\FGCVS\tidy\include\platform.h tidy4p5\include\platform.h
--- C:\FGCVS\tidy\include\platform.h	Wed Mar 19 14:01:44 2008
+++ tidy4p5\include\platform.h	Sat Jul 26 13:09:29 2008
@@ -66,6 +66,20 @@
 #define SUPPORT_ACCESSIBILITY_CHECKS 1
 #endif
 
+#ifdef _MSC_VER
+#if _MSC_VER > 1000
+#pragma warning( disable : 4189 ) /* local variable is initialized but not referenced */
+#pragma warning( disable : 4100 ) /* unreferenced formal parameter */
+#pragma warning( disable : 4706 ) /* assignment within conditional expression */
+#endif
+
+#if _MSC_VER > 1300
+#pragma warning( disable : 4996 ) /* disable depreciation warning */
+#pragma warning( disable : 4127 ) /* conditional expression is constant */
+#pragma warning( disable : 4090 ) /* 'function' : different 'const' qualifiers */
+#endif
+
+#endif /* _MSC_VER */
 
 /* Convenience defines for Mac platforms */
 
@@ -456,11 +470,14 @@
 */
 #if defined(_WIN32) && !defined(__MSL__) && !defined(__BORLANDC__)
 
-#define futime _futime
+#ifndef _INC_PERL_XSUB_H
 #define fstat _fstat
-#define utimbuf _utimbuf /* Windows seems to want utimbuf */
 #define stat _stat
 #define utime _utime
+#endif
+
+#define futime _futime
+#define utimbuf _utimbuf /* Windows seems to want utimbuf */
 #define vsnprintf _vsnprintf
 #endif /* _WIN32 */
 
@@ -475,24 +492,13 @@
 */
 #if defined(_WIN32) && !defined(__MSL__) && !defined(__BORLANDC__)
 
-#ifndef __WATCOMC__
+#if	!(defined( __WATCOMC__ ) || defined( _INC_PERL_XSUB_H ))
 #define fileno _fileno
 #define setmode _setmode
-#endif
-
 #define access _access
-#define strcasecmp _stricmp
-
-#if _MSC_VER > 1000
-#pragma warning( disable : 4189 ) /* local variable is initialized but not referenced */
-#pragma warning( disable : 4100 ) /* unreferenced formal parameter */
-#pragma warning( disable : 4706 ) /* assignment within conditional expression */
-#endif
-
-#if _MSC_VER > 1300
-#pragma warning( disable : 4996 ) /* disable depreciation warning */
 #endif
 
+#define strcasecmp _stricmp
 #endif /* _WIN32 */
 
 #if defined(_WIN32)