[cairo-commit] 2 commits - src/cairoint.h

[GitLab Mirror]

 src/cairoint.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b408352d450bb8c1b1cc17b14e0d605dc40daaed
Merge: 0d3090ad8 bd54a1bf9
Author: Uli Schlachter <psychon at znc.in>
Date:   Fri Jul 23 12:11:30 2021 +0000

    Merge branch 'issue-381' into 'master'
    
    Always define _cairo_utf8_to_utf16 on Windows
    
    Closes #381
    
    See merge request cairo/cairo!209

commit bd54a1bf9805ebb7905b857d7234271ae496f904
Author: Peter Wang <novalazy at gmail.com>
Date:   Mon Oct 21 12:22:44 2019 +1100

    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.
    
    Fixes #381

diff --git a/src/cairoint.h b/src/cairoint.h
index fd6fc9aa4..4dbb7f917 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -1912,7 +1912,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