mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-07-30 13:53:30 +02:00
18:36. incorporated proposed cleanups from gtk-devel-list.
Sat Jul 24 20:11:35 1999 Tim Janik <timj@gtk.org> * merged GLib 1.3.0 with glib-1.2.3 from Fri Jul 16 22:18:36. * incorporated proposed cleanups from gtk-devel-list. * bumped version number to GLib-1.3.1 * glib.h: * gqueue.c: * gstring.c: * glist.c: removed string tokenisation (we got g_strsplit() and g_strjoin() already) and readline functions. s/g_list_delete/g_list_delete_link. implemented g_slist_delete_link. removed notion of g_ATEXIT() macro in glib.h, this is an *internal* macro, g_atexit() is provided for public consumption. added GTrashStack inline utility functions. reimplement double eneded queues. removed GStack implementation, people can use a queue or a (singly) linked list for this task. deprecated g_strescape(), we need the SunOS variants here. * gdate.c: added DEBUG_MSG() macro to wrap old messages. * *.*: CVS merges. * upgrade to libtool 1.3.3.
This commit is contained in:
@@ -127,7 +127,7 @@ g_module_set_error (const gchar *error)
|
||||
|
||||
|
||||
/* --- include platform specifc code --- */
|
||||
#define CHECK_ERROR(rv) { g_module_set_error (NULL); }
|
||||
#define SUPPORT_OR_RETURN(rv) { g_module_set_error (NULL); }
|
||||
#if (G_MODULE_IMPL == G_MODULE_IMPL_DL)
|
||||
#include "gmodule-dl.c"
|
||||
#elif (G_MODULE_IMPL == G_MODULE_IMPL_DLD)
|
||||
@@ -139,8 +139,8 @@ g_module_set_error (const gchar *error)
|
||||
#elif (G_MODULE_IMPL == G_MODULE_IMPL_BEOS)
|
||||
#include "gmodule-beos.c"
|
||||
#else
|
||||
#undef CHECK_ERROR
|
||||
#define CHECK_ERROR(rv) { g_module_set_error ("dynamic modules are " \
|
||||
#undef SUPPORT_OR_RETURN
|
||||
#define SUPPORT_OR_RETURN(rv) { g_module_set_error ("dynamic modules are " \
|
||||
"not supported by this system"); return rv; }
|
||||
static gpointer
|
||||
_g_module_open (const gchar *file_name,
|
||||
@@ -176,7 +176,7 @@ _g_module_build_path (const gchar *directory,
|
||||
gboolean
|
||||
g_module_supported (void)
|
||||
{
|
||||
CHECK_ERROR (FALSE);
|
||||
SUPPORT_OR_RETURN (FALSE);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@@ -188,7 +188,7 @@ g_module_open (const gchar *file_name,
|
||||
GModule *module;
|
||||
gpointer handle;
|
||||
|
||||
CHECK_ERROR (NULL);
|
||||
SUPPORT_OR_RETURN (NULL);
|
||||
|
||||
if (!file_name)
|
||||
{
|
||||
@@ -284,7 +284,7 @@ g_module_open (const gchar *file_name,
|
||||
gboolean
|
||||
g_module_close (GModule *module)
|
||||
{
|
||||
CHECK_ERROR (FALSE);
|
||||
SUPPORT_OR_RETURN (FALSE);
|
||||
|
||||
g_return_val_if_fail (module != NULL, FALSE);
|
||||
g_return_val_if_fail (module->ref_count > 0, FALSE);
|
||||
@@ -354,9 +354,10 @@ g_module_symbol (GModule *module,
|
||||
gpointer *symbol)
|
||||
{
|
||||
gchar *module_error;
|
||||
|
||||
if (symbol)
|
||||
*symbol = NULL;
|
||||
CHECK_ERROR (FALSE);
|
||||
SUPPORT_OR_RETURN (FALSE);
|
||||
|
||||
g_return_val_if_fail (module != NULL, FALSE);
|
||||
g_return_val_if_fail (symbol_name != NULL, FALSE);
|
||||
@@ -374,7 +375,8 @@ g_module_symbol (GModule *module,
|
||||
*symbol = _g_module_symbol (module->handle, symbol_name);
|
||||
#endif /* !G_MODULE_NEED_USCORE */
|
||||
|
||||
if ((module_error = g_module_error()))
|
||||
module_error = g_module_error();
|
||||
if (module_error)
|
||||
{
|
||||
gchar *error;
|
||||
|
||||
|
Reference in New Issue
Block a user