mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-04 10:16:17 +01:00
reverted part of the changes from Sebastian Wilhelmi (1998-10-20). don't
Wed Oct 21 19:22:58 1998 Tim Janik <timj@gtk.org> * configure.in (G_MODULE_HAVE_DLERROR): reverted part of the changes from Sebastian Wilhelmi (1998-10-20). don't specify a specific loading behaviour (i.e. RTLD_NOW) when we are not sure whether it is supplied. changed the return value from (!f2 && f1) to (!f2 || f1) so we default to not needing an underscore. reverted the extra plugin.c building, because .lo files are not ELF libraries, this can't work. This needs further investigation on Solaris... Wed Oct 21 19:58:27 1998 Tim Janik <timj@gtk.org> * gmodule.c (g_module_symbol): fixed a string pointer bug that could cause garbage error messages from g_module_symbol() for systems that NEED_USCORE.
This commit is contained in:
parent
2009313501
commit
634e4a58c6
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
||||
Wed Oct 21 19:22:58 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* configure.in (G_MODULE_HAVE_DLERROR): reverted part of the changes
|
||||
from Sebastian Wilhelmi (1998-10-20). don't specify a specific loading
|
||||
behaviour (i.e. RTLD_NOW) when we are not sure whether it is supplied.
|
||||
changed the return value from (!f2 && f1) to (!f2 || f1) so we default
|
||||
to not needing an underscore. reverted the extra plugin.c building,
|
||||
because .lo files are not ELF libraries, this can't work. This needs
|
||||
further investigation on Solaris...
|
||||
|
||||
Wed Oct 21 17:03:05 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
@ -1,3 +1,13 @@
|
||||
Wed Oct 21 19:22:58 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* configure.in (G_MODULE_HAVE_DLERROR): reverted part of the changes
|
||||
from Sebastian Wilhelmi (1998-10-20). don't specify a specific loading
|
||||
behaviour (i.e. RTLD_NOW) when we are not sure whether it is supplied.
|
||||
changed the return value from (!f2 && f1) to (!f2 || f1) so we default
|
||||
to not needing an underscore. reverted the extra plugin.c building,
|
||||
because .lo files are not ELF libraries, this can't work. This needs
|
||||
further investigation on Solaris...
|
||||
|
||||
Wed Oct 21 17:03:05 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
@ -1,3 +1,13 @@
|
||||
Wed Oct 21 19:22:58 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* configure.in (G_MODULE_HAVE_DLERROR): reverted part of the changes
|
||||
from Sebastian Wilhelmi (1998-10-20). don't specify a specific loading
|
||||
behaviour (i.e. RTLD_NOW) when we are not sure whether it is supplied.
|
||||
changed the return value from (!f2 && f1) to (!f2 || f1) so we default
|
||||
to not needing an underscore. reverted the extra plugin.c building,
|
||||
because .lo files are not ELF libraries, this can't work. This needs
|
||||
further investigation on Solaris...
|
||||
|
||||
Wed Oct 21 17:03:05 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
@ -1,3 +1,13 @@
|
||||
Wed Oct 21 19:22:58 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* configure.in (G_MODULE_HAVE_DLERROR): reverted part of the changes
|
||||
from Sebastian Wilhelmi (1998-10-20). don't specify a specific loading
|
||||
behaviour (i.e. RTLD_NOW) when we are not sure whether it is supplied.
|
||||
changed the return value from (!f2 && f1) to (!f2 || f1) so we default
|
||||
to not needing an underscore. reverted the extra plugin.c building,
|
||||
because .lo files are not ELF libraries, this can't work. This needs
|
||||
further investigation on Solaris...
|
||||
|
||||
Wed Oct 21 17:03:05 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
@ -1,3 +1,13 @@
|
||||
Wed Oct 21 19:22:58 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* configure.in (G_MODULE_HAVE_DLERROR): reverted part of the changes
|
||||
from Sebastian Wilhelmi (1998-10-20). don't specify a specific loading
|
||||
behaviour (i.e. RTLD_NOW) when we are not sure whether it is supplied.
|
||||
changed the return value from (!f2 && f1) to (!f2 || f1) so we default
|
||||
to not needing an underscore. reverted the extra plugin.c building,
|
||||
because .lo files are not ELF libraries, this can't work. This needs
|
||||
further investigation on Solaris...
|
||||
|
||||
Wed Oct 21 17:03:05 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
@ -1,3 +1,13 @@
|
||||
Wed Oct 21 19:22:58 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* configure.in (G_MODULE_HAVE_DLERROR): reverted part of the changes
|
||||
from Sebastian Wilhelmi (1998-10-20). don't specify a specific loading
|
||||
behaviour (i.e. RTLD_NOW) when we are not sure whether it is supplied.
|
||||
changed the return value from (!f2 && f1) to (!f2 || f1) so we default
|
||||
to not needing an underscore. reverted the extra plugin.c building,
|
||||
because .lo files are not ELF libraries, this can't work. This needs
|
||||
further investigation on Solaris...
|
||||
|
||||
Wed Oct 21 17:03:05 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
@ -1,3 +1,13 @@
|
||||
Wed Oct 21 19:22:58 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* configure.in (G_MODULE_HAVE_DLERROR): reverted part of the changes
|
||||
from Sebastian Wilhelmi (1998-10-20). don't specify a specific loading
|
||||
behaviour (i.e. RTLD_NOW) when we are not sure whether it is supplied.
|
||||
changed the return value from (!f2 && f1) to (!f2 || f1) so we default
|
||||
to not needing an underscore. reverted the extra plugin.c building,
|
||||
because .lo files are not ELF libraries, this can't work. This needs
|
||||
further investigation on Solaris...
|
||||
|
||||
Wed Oct 21 17:03:05 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
@ -1,3 +1,13 @@
|
||||
Wed Oct 21 19:22:58 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* configure.in (G_MODULE_HAVE_DLERROR): reverted part of the changes
|
||||
from Sebastian Wilhelmi (1998-10-20). don't specify a specific loading
|
||||
behaviour (i.e. RTLD_NOW) when we are not sure whether it is supplied.
|
||||
changed the return value from (!f2 && f1) to (!f2 || f1) so we default
|
||||
to not needing an underscore. reverted the extra plugin.c building,
|
||||
because .lo files are not ELF libraries, this can't work. This needs
|
||||
further investigation on Solaris...
|
||||
|
||||
Wed Oct 21 17:03:05 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
@ -433,17 +433,16 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then
|
||||
dnl *** check whether we need preceeding underscores
|
||||
AC_MSG_CHECKING(for preceeding underscore in symbols)
|
||||
AC_CACHE_VAL(glib_cv_uscore,[
|
||||
echo "int glib_underscore_test (void) { return 42; }" >plugin.c
|
||||
./libtool --mode=compile $CC -c plugin.c >/dev/null 2>&1
|
||||
AC_TRY_RUN([
|
||||
#include <dlfcn.h>
|
||||
int glib_underscore_test (void) { return 42; }
|
||||
int main() {
|
||||
void *f1 = (void*)0, *f2 = (void*)0, *handle;
|
||||
handle = dlopen ("./plugin.lo", RTLD_NOW );
|
||||
handle = dlopen ((void*)0, 0);
|
||||
if (handle) {
|
||||
f1 = dlsym (handle, "glib_underscore_test");
|
||||
f2 = dlsym (handle, "_glib_underscore_test");
|
||||
} return (!f2 && f1);
|
||||
} return (!f2 || f1);
|
||||
}],
|
||||
glib_cv_uscore=yes,
|
||||
glib_cv_uscore=no,
|
||||
|
@ -1,3 +1,9 @@
|
||||
Wed Oct 21 19:58:27 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gmodule.c (g_module_symbol): fixed a string pointer bug that could
|
||||
cause garbage error messages from g_module_symbol() for systems that
|
||||
NEED_USCORE.
|
||||
|
||||
Mon Sep 21 01:54:48 1998 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gmodule.h:
|
||||
|
@ -319,9 +319,13 @@ g_module_symbol (GModule *module,
|
||||
g_return_val_if_fail (symbol != NULL, FALSE);
|
||||
|
||||
#ifdef G_MODULE_NEED_USCORE
|
||||
symbol_name = g_strconcat ("_", symbol_name, NULL);
|
||||
*symbol = _g_module_symbol (module->handle, symbol_name);
|
||||
g_free (symbol_name);
|
||||
{
|
||||
gchar *name;
|
||||
|
||||
name = g_strconcat ("_", symbol_name, NULL);
|
||||
*symbol = _g_module_symbol (module->handle, name);
|
||||
g_free (name);
|
||||
}
|
||||
#else /* !G_MODULE_NEED_USCORE */
|
||||
*symbol = _g_module_symbol (module->handle, symbol_name);
|
||||
#endif /* !G_MODULE_NEED_USCORE */
|
||||
|
Loading…
Reference in New Issue
Block a user