ICU-12766 merge from trunk

X-SVN-Rev: 39808

diff --cc icu4c/source/test/intltest/Makefile.in
index 416d0a91bf98ce0a612638ab55ff052e24e5f7e4,d040871ebea66438badc57b63bb55ca981d7259d..c4ba088f4f6a769ac022b0ad340f42d88d4e1ef0
--- 1/icu4c/source/test/intltest/Makefile.in
--- 2/icu4c/source/test/intltest/Makefile.in
+++ b/icu4c/source/test/intltest/Makefile.in
@@@ -34,8 -34,8 +34,8 @@@ BUILDDIR := $(BUILDDIR:test\\intltest/.
  # Simplify the path for Windows 98
  BUILDDIR := $(BUILDDIR:TEST\\INTLTEST/../../=)
  
 -CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/tools/ctestfw
 +CPPFLAGS += -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/tools/ctestfw
- CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT= -DUNISTR_FROM_STRING_EXPLICIT=
+ CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT= -DUNISTR_FROM_STRING_EXPLICIT= -DUCHAR_TYPE=char16_t
  DEFS += -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"'
  LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) $(LIB_THREAD)