Index: third_party/harfbuzz-ng/src/hb-gobject-enums.cc.tmpl |
diff --git a/third_party/harfbuzz-ng/src/hb-gobject-enums.cc.tmpl b/third_party/harfbuzz-ng/src/hb-gobject-enums.cc.tmpl |
index 05abd898d4f081b84e23c051ae2306a2164e7032..ca458a3846cb0b0628a15b572a3478b6cbbd2a0f 100644 |
--- a/third_party/harfbuzz-ng/src/hb-gobject-enums.cc.tmpl |
+++ b/third_party/harfbuzz-ng/src/hb-gobject-enums.cc.tmpl |
@@ -45,13 +45,12 @@ |
/*** END file-production ***/ |
/*** BEGIN value-header ***/ |
-inline static /* TODO(behdad) disable these for now until we fix them... */ |
GType |
@enum_name@_get_type (void) |
{ |
- static volatile gsize g_define_type_id__volatile = 0; |
+ static gsize type_id = 0; |
- if (g_once_init_enter (&g_define_type_id__volatile)) |
+ if (g_once_init_enter (&type_id)) |
{ |
static const G@Type@Value values[] = { |
/*** END value-header ***/ |
@@ -63,12 +62,12 @@ GType |
/*** BEGIN value-tail ***/ |
{ 0, NULL, NULL } |
}; |
- GType g_define_type_id = |
+ GType id = |
g_@type@_register_static (g_intern_static_string ("@EnumName@"), values); |
- g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); |
+ g_once_init_leave (&type_id, id); |
} |
- return g_define_type_id__volatile; |
+ return type_id; |
} |
/*** END value-tail ***/ |