diff options
| author | Emmanuele Bassi <ebassi@linux.intel.com> | 2011-03-15 09:03:28 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2011-03-15 09:03:28 +0000 |
| commit | 08f0a312895e0dd457f5f4d5bcdf282a6d5a793f (patch) | |
| tree | c007d8a6024c8c1ee088b8a53caa5dac435cda2f /gmodule | |
| parent | 0c1acc7e741a01bf37d4c5f7a97ba1661f25d36a (diff) | |
Revert "Remove all uses of G_CONST_RETURN"
This reverts commit 36741245cca56e979fe85e3de676fb3912058f2c.
The removal has not been discussed, except on Bugzilla:
https://bugzilla.gnome.org/show_bug.cgi?id=644611
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/gmodule.c | 6 | ||||
| -rw-r--r-- | gmodule/gmodule.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c index 3e076ec86..2d7f410b6 100644 --- a/gmodule/gmodule.c +++ b/gmodule/gmodule.c @@ -598,7 +598,7 @@ g_module_make_resident (GModule *module) module->is_resident = TRUE; } -const gchar * +G_CONST_RETURN gchar* g_module_error (void) { return g_static_private_get (&module_error_private); @@ -648,7 +648,7 @@ g_module_symbol (GModule *module, return !module_error; } -const gchar * +G_CONST_RETURN gchar* g_module_name (GModule *module) { g_return_val_if_fail (module != NULL, NULL); @@ -663,7 +663,7 @@ g_module_name (GModule *module) #undef g_module_name -const gchar * +G_CONST_RETURN gchar* g_module_name (GModule *module) { g_return_val_if_fail (module != NULL, NULL); diff --git a/gmodule/gmodule.h b/gmodule/gmodule.h index 5f18f9db1..ae7f8e54a 100644 --- a/gmodule/gmodule.h +++ b/gmodule/gmodule.h @@ -71,7 +71,7 @@ gboolean g_module_close (GModule *module); void g_module_make_resident (GModule *module); /* query the last module error as a string */ -const gchar * g_module_error (void); +G_CONST_RETURN gchar* g_module_error (void); /* retrieve a symbol pointer from `module', returns TRUE on success */ gboolean g_module_symbol (GModule *module, @@ -79,7 +79,7 @@ gboolean g_module_symbol (GModule *module, gpointer *symbol); /* retrieve the file name from an existing module */ -const gchar * g_module_name (GModule *module); +G_CONST_RETURN gchar* g_module_name (GModule *module); /* Build the actual file name containing a module. `directory' is the * directory where the module file is supposed to be, or NULL or empty |