view src/cairo-2-static-init.patch @ 3557:b1a7cff2d2a9

Add octave forge of-netcdf package (and support files) * src/of-netcdf.mk: New file. * src/netcdf.mk: Update checksum for version 4.3.0, install to DESTDIR. * src/hdf5.mk: make make and make install separate, modify libtool script to enable dynamic build of all sub libraries. * index.html: added of-netcdf * dist-files.mk: add of-netcdf.mk * Makefile.in: add of-netcdf * build_packages.m: add install of netcdf-1.0.2.tar.gz
author John Donoghue <john.donoghue@ieee.org>
date Thu, 06 Mar 2014 18:34:21 -0500
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))