Subtle Windows changes

diff --git a/Modules/regexpr.c b/Modules/regexpr.c
index 841f500d095b100911cb6b42b170f212308f0cc8..6d6bb0f3befb94f17007174a5424335fc48aeb1d 100644 (file)
--- a/Modules/regexpr.c
+++ b/Modules/regexpr.c
@@ -35,7 +35,7 @@ from GNU regexp.
 #include <stdlib.h>
 #include <string.h>
 #else
-#ifdef __STDC__
+#if defined(__STDC__) || defined(_MSC_VER)
 /* Don't mess around, use the standard headers */
 #include <stdlib.h>
 #include <string.h>
@@ -912,7 +912,7 @@ regexp_t bufp;
 }
 
 #define INITIAL_FAILURES  128  /* initial # failure points to allocate */
-#define MAX_FAILURES     4100  /* max # of failure points before failing */
+#define MAX_FAILURES     4100L /* max # of failure points before failing */
 
 int re_match_2(bufp, string1, size1, string2, size2, pos, regs, mstop)
 regexp_t bufp;