[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 win32/config-msvc.mak |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit ebf927d3d4394159e480fec2042a0456df8dd0f4
Author: ebraminio <ebrahim at gnu.org>
Date:   Mon Jan 9 13:12:09 2017 +0330

    Make UCDN default enabled (fixes #389) (#391)

diff --git a/win32/config-msvc.mak b/win32/config-msvc.mak
index ecbbe92..4cffaea 100644
--- a/win32/config-msvc.mak
+++ b/win32/config-msvc.mak
@@ -184,9 +184,10 @@ HB_CFLAGS =	$(HB_CFLAGS) /DU_HAVE_INT8_T
 HB_SOURCES = $(HB_SOURCES) $(HB_ICU_sources)
 HB_HEADERS = $(HB_HEADERS) $(HB_ICU_headers)
 HB_DEP_LIBS = $(HB_DEP_LIBS) $(HB_ICU_DEP_LIBS)
-!else
-# If there is no GLib support, use the built-in UCDN
-# and define some of the macros in GLib's msvc_recommended_pragmas.h
+!endif
+
+!if "$(UCDN)" != "0"
+# Define some of the macros in GLib's msvc_recommended_pragmas.h
 # to reduce some unneeded build-time warnings
 HB_DEFINES = $(HB_DEFINES) /DHAVE_UCDN=1
 HB_CFLAGS =	\