diff src/cairo-2-static-init.patch @ 3167:6aaa1723e277

[MSVC] enable Cairo compilation (and bump version to 1.12.14)
author Michael Goffioul <michael.goffioul@gmail.com>
date Mon, 22 Jul 2013 15:40:11 -0400
parents d6edff1d892a
children
line wrap: on
line diff
--- a/src/cairo-2-static-init.patch	Mon Jul 22 12:16:41 2013 -0400
+++ b/src/cairo-2-static-init.patch	Mon Jul 22 15:40:11 2013 -0400
@@ -7,20 +7,24 @@
 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)
+@@ -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,8 @@ _cairo_win32_font_face_hash_table_destroy (void)
+@@ -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);