From 6fb8d8fb11bbcb9df6cb3a0d4af1c844b83ee49d Mon Sep 17 00:00:00 2001
From: Peter Wang <novalazy@gmail.com>
Date: Mon, 21 Oct 2019 12:22:44 +1100
Subject: [PATCH] Always define _cairo_utf8_to_utf16 on Windows

_cairo_utf8_to_utf16 is used by _cairo_fopen on Windows so must be
defined even if Win32 fonts or other features are disabled.
---
 src/cairoint.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cairoint.h b/src/cairoint.h
index 7c1000556..165c6d8ee 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -1913,7 +1913,7 @@ cairo_private int
 _cairo_ucs4_to_utf16 (uint32_t    unicode,
 		      uint16_t   *utf16);
 
-#if CAIRO_HAS_WIN32_FONT || CAIRO_HAS_QUARTZ_FONT || CAIRO_HAS_PDF_OPERATORS
+#if _WIN32 || CAIRO_HAS_WIN32_FONT || CAIRO_HAS_QUARTZ_FONT || CAIRO_HAS_PDF_OPERATORS
 # define CAIRO_HAS_UTF8_TO_UTF16 1
 #endif
 #if CAIRO_HAS_UTF8_TO_UTF16
-- 
2.23.0

