From: Anatol Belski <ab@php.net>
Date: Fri, 30 Mar 2018 04:44:25 +0000 (+0200)
Subject: Revert the automatic namespace addition
X-Git-Tag: php-7.3.0alpha1~107
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cad2a0f9c3f07b79269c49db491d7855ac13b4d2;p=php

Revert the automatic namespace addition
---

diff --git a/acinclude.m4 b/acinclude.m4
index 4f1328c9ba..4e5f055272 100644
--- 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 11a16533d8..2aa408fac0 100644
--- 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");