diff options
| author | Anatol Belski <ab@php.net> | 2014-01-17 11:08:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-01-17 11:08:02 +0100 |
| commit | b58dbefba02aeebc840ea0c4058f5d7b2e3368d1 (patch) | |
| tree | 72606d1dbcbde6863f7c05ed66de8db310a810c8 | |
| parent | 98e6c8ca2db38b2f129de15e6a4ee4e96c1b6f7a (diff) | |
| parent | 7f0aff52cf35db89c1285ddb931fc118e1127561 (diff) | |
| download | php-git-b58dbefba02aeebc840ea0c4058f5d7b2e3368d1.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
added appropriate exception handling flag to ext\intl
Update NEWS
| -rw-r--r-- | ext/intl/config.w32 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/intl/config.w32 b/ext/intl/config.w32 index bb1dca8124..22cde6bd6d 100644 --- a/ext/intl/config.w32 +++ b/ext/intl/config.w32 @@ -118,6 +118,7 @@ if (PHP_INTL != "no") { "intl"); ADD_FLAG("LIBS_INTL", "icudt.lib icuin.lib icuio.lib icule.lib iculx.lib"); + ADD_FLAG("CFLAGS_INTL", "/EHsc"); AC_DEFINE("HAVE_INTL", 1, "Internationalization support enabled"); } else { WARNING("intl not enabled; libraries and/or headers not found"); |