diff -Naur php-5.6.38/acinclude.m4 php-5.6.38-icu-61.1/acinclude.m4 --- php-5.6.38/acinclude.m4 2018-09-12 00:12:36.000000000 +0200 +++ php-5.6.38-icu-61.1/acinclude.m4 2018-10-29 14:13:27.361534483 +0100 @@ -2244,6 +2244,9 @@ ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio` PHP_EVAL_INCLINE($ICU_INCS) PHP_EVAL_LIBLINE($ICU_LIBS, $1) + + ICU_EXTRA_FLAGS=`$ICU_CONFIG --cxxflags` + ICU_EXTRA_FLAGS="$ICU_EXTRA_FLAGS -DU_USING_ICU_NAMESPACE=1" fi ]) diff -Naur php-5.6.38/ext/intl/config.m4 php-5.6.38-icu-61.1/ext/intl/config.m4 --- php-5.6.38/ext/intl/config.m4 2018-09-12 00:12:36.000000000 +0200 +++ php-5.6.38-icu-61.1/ext/intl/config.m4 2018-10-29 14:14:34.845610037 +0100 @@ -85,7 +85,7 @@ breakiterator/codepointiterator_internal.cpp \ breakiterator/codepointiterator_methods.cpp \ idn/idn.c \ - $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings) + $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings $ICU_EXTRA_FLAGS) PHP_ADD_BUILD_DIR($ext_builddir/collator) PHP_ADD_BUILD_DIR($ext_builddir/converter) PHP_ADD_BUILD_DIR($ext_builddir/common) diff -Naur php-5.6.38/ext/intl/config.w32 php-5.6.38-icu-61.1/ext/intl/config.w32 --- php-5.6.38/ext/intl/config.w32 2018-09-12 00:12:36.000000000 +0200 +++ php-5.6.38-icu-61.1/ext/intl/config.w32 2018-10-29 14:15:03.394218951 +0100 @@ -118,7 +118,7 @@ "intl"); ADD_FLAG("LIBS_INTL", "icudt.lib icuin.lib icuio.lib icule.lib iculx.lib"); - ADD_FLAG("CFLAGS_INTL", "/EHsc"); + ADD_FLAG("CFLAGS_INTL", "/EHsc /D U_USING_ICU_NAMESPACE=1"); AC_DEFINE("HAVE_INTL", 1, "Internationalization support enabled"); } else { WARNING("intl not enabled; libraries and/or headers not found");