fix missing header and conflicting symbol

diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c
index ad2332c54090e56e8ce7f346c708399acb2540d9..5dd226e473953764aaa954f428d2d69e630581b1 100644 (file)
--- a/ext/calendar/calendar.c
+++ b/ext/calendar/calendar.c
@@ -24,10 +24,6 @@
 #include "config.h"
 #endif
 
-#ifdef PHP_WIN32
-#define _WINNLS_
-#endif
-
 #include "php.h"
 #include "ext/standard/info.h"
 #include "php_calendar.h"
@@ -35,6 +31,12 @@
 
 #include <stdio.h>
 
+#ifdef PHP_WIN32
+/* This conflicts with a define in winnls.h, but that header is needed
+   to have GetACP(). */
+#undef CAL_GREGORIAN
+#endif
+
 /* {{{ arginfo */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_unixtojd, 0, 0, 0)
        ZEND_ARG_INFO(0, timestamp)