view src/cairo-2-static-init.patch @ 2661:3567da505594

json-c update to version 0.10, using github downloads. Squashed commit of the following: commit a93e1e80e4a6b668009bd024923e387f71eff7a3 Author: Thomas Mayer <thomas@residuum.org> Date: Tue Jul 17 23:16:59 2012 +0200 Patches for: - missing file - remove check for rpl_* functions commit ad94ec0c30381acb9ac25db96182a1308b9fbd3c Author: Thomas Mayer <thomas@residuum.org> Date: Tue Jul 17 19:08:40 2012 +0200 Fixed indentation commit 78b51e08e5174454495b8df547c4bccdc06bef73 Author: Thomas Mayer <thomas@residuum.org> Date: Tue Jul 17 01:13:08 2012 +0200 json-c compiles correctly (finally). commit 0c4bb3a6b4b6db1ac6a6d098ce55041db55bc8ab Author: Thomas Mayer <thomas@residuum.org> Date: Fri Jul 13 22:16:41 2012 +0200 Changes to json-c files according to current MXE standards. commit a533fe5439d56de76c2d3b9d634c597cba94ff52 Author: Thomas Mayer <thomas@residuum.org> Date: Thu Jul 12 22:27:54 2012 +0200 Update to json-c 0.10, and use github repository.
author Thomas Mayer <thomas@residuum.org>
date Tue, 17 Jul 2012 23:18:18 +0200
parents d6edff1d892a
children 6aaa1723e277
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,8 @@ _cairo_win32_font_face_hash_table_destroy (void)
 {
     cairo_hash_table_t *hash_table;
 
+    CAIRO_MUTEX_INITIALIZE ();
+
     /* 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,8 @@ _cairo_win32_font_face_hash_table_destroy (void)
 static cairo_hash_table_t *
 _cairo_win32_font_face_hash_table_lock (void)
 {
+    CAIRO_MUTEX_INITIALIZE ();
+
     CAIRO_MUTEX_LOCK (_cairo_win32_font_face_mutex);
 
     if (unlikely (cairo_win32_font_face_hash_table == NULL))