Revert the automatic namespace addition

diff --git a/acinclude.m4 b/acinclude.m4
index 4f1328c9ba571a61a95b751271ef2a4fbac8d4ed..4e5f0552723f779bb1fac7f1e8706103a73c34bc 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2239,7 +2239,6 @@ AC_DEFUN([PHP_SETUP_ICU],[
     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 --git a/ext/intl/config.w32 b/ext/intl/config.w32
index 11a16533d81a92d050cf4da37ffd6731e3b6f20d..2aa408fac08141960a66a52bfffc3bb0d9f48da3 100644 (file)
--- a/ext/intl/config.w32
+++ b/ext/intl/config.w32
@@ -129,7 +129,7 @@ if (PHP_INTL != "no") {
                        ADD_FLAG("LIBS_INTL", "iculx.lib");
                }
 
-               ADD_FLAG("CFLAGS_INTL", "/EHsc /D U_USING_ICU_NAMESPACE=1");
+               ADD_FLAG("CFLAGS_INTL", "/EHsc");
                AC_DEFINE("HAVE_INTL", 1, "Internationalization support enabled");
        } else {
                WARNING("intl not enabled; libraries and/or headers not found");