Revert the automatic namespace addition

weltling · weltling · commit cad2a0f9c3f0 · 2018-03-31T18:51:56.000+02:00
diff --git 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
@@ -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");

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ if (PHP_INTL != "no") {`
`129`	`129`	`ADD_FLAG("LIBS_INTL", "iculx.lib");`
`130`	`130`	`}`
`131`	`131`
`132`		`- ADD_FLAG("CFLAGS_INTL", "/EHsc /D U_USING_ICU_NAMESPACE=1");`
	`132`	`+ ADD_FLAG("CFLAGS_INTL", "/EHsc");`
`133`	`133`	`AC_DEFINE("HAVE_INTL", 1, "Internationalization support enabled");`
`134`	`134`	`} else {`
`135`	`135`	`WARNING("intl not enabled; libraries and/or headers not found");`