luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-13 12:56:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avoid-name-collisions' into 'main'

Browse Source 
GResource compiler: Prefix static [con|de]strutors with c_name

See merge request GNOME/glib!2197
This commit is contained in:
Philip Withnall 2021-07-26 09:34:19 +00:00
commit 1faa5cd4d0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gio/glib-compile-resources.c
View File

@ -1183,27 +1183,29 @@ main (int argc, char **argv)
"#ifdef G_HAS_CONSTRUCTORS\n" "#ifdef G_HAS_CONSTRUCTORS\n"
"\n" "\n"
"#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA\n" "#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA\n"
"#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(resource_constructor)\n" "#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(%sresource_constructor)\n"
"#endif\n" "#endif\n"
"G_DEFINE_CONSTRUCTOR(resource_constructor)\n" "G_DEFINE_CONSTRUCTOR(%sresource_constructor)\n"
"#ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA\n" "#ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA\n"
"#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(resource_destructor)\n" "#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(%sresource_destructor)\n"
"#endif\n" "#endif\n"
"G_DEFINE_DESTRUCTOR(resource_destructor)\n" "G_DEFINE_DESTRUCTOR(%sresource_destructor)\n"
"\n" "\n"
"#else\n" "#else\n"
"#warning \"Constructor not supported on this compiler, linking in resources will not work\"\n" "#warning \"Constructor not supported on this compiler, linking in resources will not work\"\n"
"#endif\n" "#endif\n"
"\n" "\n"
"static void resource_constructor (void)\n" "static void %sresource_constructor (void)\n"
"{\n" "{\n"
" g_static_resource_init (&static_resource);\n" " g_static_resource_init (&static_resource);\n"
"}\n" "}\n"
"\n" "\n"
"static void resource_destructor (void)\n" "static void %sresource_destructor (void)\n"
"{\n" "{\n"
" g_static_resource_fini (&static_resource);\n" " g_static_resource_fini (&static_resource);\n"
"}\n"); "}\n",
c_name, c_name, c_name,
c_name, c_name, c_name);
} }
fclose (file); fclose (file);