diff options
| author | Alessandro Pignotti <a.pignotti@sssup.it> | 2011-05-25 16:58:22 +0200 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2012-08-27 23:33:44 -0400 |
| commit | f81174dd4f8f8601bbf1066ba9757a4a13bb3c60 (patch) | |
| tree | 0e82fb42338c2247ea2e80b10b77da86e1482346 | |
| parent | 43f077b4bd6710b27645add20af26234e0266052 (diff) | |
| download | pango-f81174dd4f8f8601bbf1066ba9757a4a13bb3c60.tar.gz | |
Make static data thread safe in pangowin32-fontmap.c
| -rw-r--r-- | pango/pangowin32-fontmap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index 9cfa1611..36456fcf 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -696,10 +696,8 @@ pango_win32_font_map_for_display (void) /* Make sure that the type system is initialized */ g_type_init (); - if (default_fontmap != NULL) - return PANGO_FONT_MAP (default_fontmap); - - default_fontmap = g_object_new (PANGO_TYPE_WIN32_FONT_MAP, NULL); + if (g_once_init_enter ((gsize*)&default_fontmap)) + g_once_init_leave((gsize*)&default_fontmap, (gsize)g_object_new (PANGO_TYPE_WIN32_FONT_MAP, NULL)); return PANGO_FONT_MAP (default_fontmap); } |