[farsight2/master] Register enum types in a thread safe way

[Olivier Crête]

---
 common-modified/glib-gen.mak |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common-modified/glib-gen.mak b/common-modified/glib-gen.mak
index 068b945..581484f 100644
--- a/common-modified/glib-gen.mak
+++ b/common-modified/glib-gen.mak
@@ -30,9 +30,9 @@ enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
 	glib-mkenums \
 	--fhead "#include \"$*-enum-types.h\"\n$(enum_headers)" \
 	--fprod "\n/* enumerations from \"@filename@\" */" \
-	--vhead "GType\n at enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G at Type@Value values[] = {"     \
+	--vhead "GType\n at 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 at Type@Value values[] = {"     \
 	--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-	--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_ at type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+	--vtail "      { 0, NULL, NULL }\n    };\n    GType g_define_type_id = g_ at 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
-- 
1.5.6.5