diff options
| author | Anatol Belski <ab@php.net> | 2016-07-26 14:00:24 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-07-26 14:00:24 +0200 |
| commit | a35adb8b22d72550381479de61001caa03c93988 (patch) | |
| tree | 08e21fb81db10fad5dbbe458c865190153f30d51 /ext/calendar/calendar.c | |
| parent | 893e3b06eade38545b9802a3f06a989b265df0bf (diff) | |
| download | php-git-a35adb8b22d72550381479de61001caa03c93988.tar.gz | |
fix missing header and conflicting symbol
Diffstat (limited to 'ext/calendar/calendar.c')
| -rw-r--r-- | ext/calendar/calendar.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c index ad2332c540..5dd226e473 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) |