at 23.11-beta 87 lines 2.0 kB view raw
1--- glib-source/gobject/gtype.c 2016-08-17 17:20:47.000000000 +0200 2+++ glib-source/gobject/gtype.c 2016-09-01 21:56:31.777406646 +0200 3@@ -209,6 +209,9 @@ 4 static gboolean type_node_is_a_L (TypeNode *node, 5 TypeNode *iface_node); 6 7+#if !defined(__GLIBC__) 8+static void gobject_init (void); 9+#endif 10 11 /* --- enumeration --- */ 12 13@@ -2631,7 +2634,10 @@ 14 GTypeFlags flags) 15 { 16 TypeNode *node; 17- 18+ 19+#if !defined(__GLIBC__) 20+ gobject_init(); 21+#endif 22 g_assert_type_system_initialized (); 23 g_return_val_if_fail (type_id > 0, 0); 24 g_return_val_if_fail (type_name != NULL, 0); 25@@ -2749,6 +2755,9 @@ 26 TypeNode *pnode, *node; 27 GType type = 0; 28 29+#if !defined(__GLIBC__) 30+ gobject_init(); 31+#endif 32 g_assert_type_system_initialized (); 33 g_return_val_if_fail (parent_type > 0, 0); 34 g_return_val_if_fail (type_name != NULL, 0); 35@@ -2804,6 +2813,9 @@ 36 TypeNode *pnode, *node; 37 GType type; 38 39+#if !defined(__GLIBC__) 40+ gobject_init(); 41+#endif 42 g_assert_type_system_initialized (); 43 g_return_val_if_fail (parent_type > 0, 0); 44 g_return_val_if_fail (type_name != NULL, 0); 45@@ -3319,6 +3331,9 @@ 46 { 47 TypeNode *node; 48 49+#if !defined(__GLIBC__) 50+ gobject_init(); 51+#endif 52 g_assert_type_system_initialized (); 53 54 node = lookup_type_node_I (type); 55@@ -4343,6 +4358,9 @@ 56 void 57 g_type_init_with_debug_flags (GTypeDebugFlags debug_flags) 58 { 59+#if !defined(__GLIBC__) 60+ gobject_init(); 61+#endif 62 g_assert_type_system_initialized (); 63 64 if (debug_flags) 65@@ -4361,6 +4379,9 @@ 66 void 67 g_type_init (void) 68 { 69+#if !defined(__GLIBC__) 70+ gobject_init(); 71+#endif 72 g_assert_type_system_initialized (); 73 } 74 75@@ -4372,6 +4393,12 @@ 76 TypeNode *node; 77 GType type; 78 79+#if !defined(__GLIBC__) 80+ static int gobject_initialized = 0; 81+ if (gobject_initialized) 82+ return; 83+ gobject_initialized = 1; 84+#endif 85 /* Ensure GLib is initialized first, see 86 * https://bugzilla.gnome.org/show_bug.cgi?id=756139 87 */