mirror of
https://github.com/brl/mutter.git
synced 2025-02-19 22:54:08 +00:00
Do not pass flags to g_module_open(NULL)
The flags are ignored when opening the main module, so we should pass 0 to avoid confusion when reading the source.
This commit is contained in:
parent
4262f79f34
commit
30bc36082e
@ -244,7 +244,7 @@ resolve_alpha_func (const gchar *name)
|
|||||||
CLUTTER_NOTE (SCRIPT, "Looking up '%s' alpha function", name);
|
CLUTTER_NOTE (SCRIPT, "Looking up '%s' alpha function", name);
|
||||||
|
|
||||||
if (G_UNLIKELY (module == NULL))
|
if (G_UNLIKELY (module == NULL))
|
||||||
module = g_module_open (NULL, G_MODULE_BIND_LAZY);
|
module = g_module_open (NULL, 0);
|
||||||
|
|
||||||
if (g_module_symbol (module, name, (gpointer) &func))
|
if (g_module_symbol (module, name, (gpointer) &func))
|
||||||
{
|
{
|
||||||
|
@ -76,7 +76,7 @@ clutter_script_get_type_from_symbol (const gchar *symbol)
|
|||||||
GType gtype = G_TYPE_INVALID;
|
GType gtype = G_TYPE_INVALID;
|
||||||
|
|
||||||
if (!module)
|
if (!module)
|
||||||
module = g_module_open (NULL, G_MODULE_BIND_LAZY);
|
module = g_module_open (NULL, 0);
|
||||||
|
|
||||||
if (g_module_symbol (module, symbol, (gpointer)&func))
|
if (g_module_symbol (module, symbol, (gpointer)&func))
|
||||||
gtype = func ();
|
gtype = func ();
|
||||||
@ -95,7 +95,7 @@ clutter_script_get_type_from_class (const gchar *name)
|
|||||||
gint i;
|
gint i;
|
||||||
|
|
||||||
if (G_UNLIKELY (!module))
|
if (G_UNLIKELY (!module))
|
||||||
module = g_module_open (NULL, G_MODULE_BIND_LAZY);
|
module = g_module_open (NULL, 0);
|
||||||
|
|
||||||
for (i = 0; name[i] != '\0'; i++)
|
for (i = 0; name[i] != '\0'; i++)
|
||||||
{
|
{
|
||||||
@ -803,7 +803,7 @@ resolve_alpha_func (const gchar *name)
|
|||||||
CLUTTER_NOTE (SCRIPT, "Looking up '%s' alpha function", name);
|
CLUTTER_NOTE (SCRIPT, "Looking up '%s' alpha function", name);
|
||||||
|
|
||||||
if (G_UNLIKELY (!module))
|
if (G_UNLIKELY (!module))
|
||||||
module = g_module_open (NULL, G_MODULE_BIND_LAZY);
|
module = g_module_open (NULL, 0);
|
||||||
|
|
||||||
if (g_module_symbol (module, name, (gpointer) &func))
|
if (g_module_symbol (module, name, (gpointer) &func))
|
||||||
{
|
{
|
||||||
|
@ -906,7 +906,7 @@ clutter_script_connect_signals (ClutterScript *script,
|
|||||||
}
|
}
|
||||||
|
|
||||||
cd = g_new (ConnectData, 1);
|
cd = g_new (ConnectData, 1);
|
||||||
cd->module = g_module_open (NULL, G_MODULE_BIND_LAZY);
|
cd->module = g_module_open (NULL, 0);
|
||||||
cd->data = user_data;
|
cd->data = user_data;
|
||||||
|
|
||||||
clutter_script_connect_signals_full (script,
|
clutter_script_connect_signals_full (script,
|
||||||
|
@ -97,8 +97,8 @@ cogl_get_proc_address (const gchar* name)
|
|||||||
|
|
||||||
/* this should find the right function if the program is linked against a
|
/* this should find the right function if the program is linked against a
|
||||||
* library providing it */
|
* library providing it */
|
||||||
if (module == NULL)
|
if (G_UNLIKELY (module == NULL))
|
||||||
module = g_module_open (NULL, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
|
module = g_module_open (NULL, 0);
|
||||||
|
|
||||||
if (module)
|
if (module)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user