com php-src: fix missing header and conflicting symbol: ext/calendar/calendar.c
| From: | Anatol Belski | Date: | Tue, 26 Jul 2016 12:00:24 +0000 |
| Subject: | com php-src: fix missing header and conflicting symbol: ext/calendar/calendar.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93400@lists.php.net to get a copy of this message | ||
Commit: a35adb8b22d72550381479de61001caa03c93988
Author: Anatol Belski <ab@php.net> Tue, 26 Jul 2016 14:00:24 +0200
Parents: 893e3b06eade38545b9802a3f06a989b265df0bf
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a35adb8b22d72550381479de61001caa03c93988
Log:
fix missing header and conflicting symbol
Changed paths:
M ext/calendar/calendar.c
Diff:
diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c
index ad2332c..5dd226e 100644
--- 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)