Mercurial > mxe-octave
view src/cairo-2-static-init.patch @ 4590:5b5c47cd2111
Add file with hg id of MXE-Octave to dist package (bug #52794).
* tools/mk-hg-id.sh: New file copied (mostly) from Octave sources.
* Makefile.in: Call shell script, copy HG-ID in make dist
* binary-dist-rules.mk: Copy HG-ID to dist directory.
* dist-files.mk: add mk-hg-id.sh to dist files
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Wed, 03 Jan 2018 14:18:12 +0100 |
parents | 6aaa1723e277 |
children |
line wrap: on
line source
This file is part of MXE. See index.html for further information. When DllMain is not being run, we need to initialize the font face mutex before using it. diff --git a/src/win32/cairo-win32-font.c b/src/win32/cairo-win32-font.c index a65d81b..31d854d 100644 --- a/src/win32/cairo-win32-font.c +++ b/src/win32/cairo-win32-font.c @@ -1912,6 +1912,10 @@ _cairo_win32_font_face_hash_table_destroy (void) { cairo_hash_table_t *hash_table; +#ifndef DLL_EXPORT + CAIRO_MUTEX_INITIALIZE (); +#endif + /* We manually acquire the lock rather than calling * _cairo_win32_font_face_hash_table_lock simply to avoid creating * the table only to destroy it again. */ @@ -1927,6 +1929,10 @@ _cairo_win32_font_face_hash_table_destroy (void) static cairo_hash_table_t * _cairo_win32_font_face_hash_table_lock (void) { +#ifndef DLL_EXPORT + CAIRO_MUTEX_INITIALIZE (); +#endif + CAIRO_MUTEX_LOCK (_cairo_win32_font_face_mutex); if (unlikely (cairo_win32_font_face_hash_table == NULL))