diff options
| author | Olivier Crête <olivier.crete@collabora.co.uk> | 2009-07-13 12:13:10 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.co.uk> | 2009-07-13 12:13:10 -0400 |
| commit | fedaaee6fa5c0006f5b7264732cb4e29584ef100 (patch) | |
| tree | f8c2c5732c15e7b16b48fb608c02ec9feda00011 | |
| parent | eddd11c916770de169918b2d147708cf7bfff580 (diff) | |
glib-gen: Use g_once_init to protect enum registration
Make use that enums are only registered once by using g_once_init_enter/leave()
| -rw-r--r-- | glib-gen.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glib-gen.mak b/glib-gen.mak index f9027da..e5fcde1 100644 --- a/glib-gen.mak +++ b/glib-gen.mak @@ -30,9 +30,9 @@ enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") glib-mkenums \ --fhead "#include \"$*-enumtypes.h\"\n$(enum_headers)" \ --fprod "\n/* enumerations from \"@filename@\" */" \ - --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static volatile gsize g_define_type_id__volatile = 0;\n if (g_once_init_enter (&g_define_type_id__volatile)) {\n static const G@Type@Value values[] = {" \ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + --vtail " { 0, NULL, NULL }\n };\n GType g_define_type_id = g_@type@_register_static (\"@EnumName@\", values);\n g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);\n }\n return g_define_type_id__volatile;\n}\n" \ $^ > $@ # a hack rule to make sure .Plo files exist because they get include'd |