aboutsummaryrefslogtreecommitdiff
path: root/dlfcn
diff options
context:
space:
mode:
Diffstat (limited to 'dlfcn')
-rw-r--r--dlfcn/dlerror.c8
-rw-r--r--dlfcn/dlinfo.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/dlfcn/dlerror.c b/dlfcn/dlerror.c
index f732deb868..1cde04b080 100644
--- a/dlfcn/dlerror.c
+++ b/dlfcn/dlerror.c
@@ -1,6 +1,5 @@
/* Return error detail for failing <dlfcn.h> functions.
- Copyright (C) 1995,1996,1997,1998,1999,2000,2002,2003
- Free Software Foundation, Inc.
+ Copyright (C) 1995-2000,2002,2003,2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -24,6 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include <bits/libc-lock.h>
+#include <ldsodefs.h>
/* Type for storing results of dynamic loading actions. */
struct dl_action_result
@@ -141,8 +141,8 @@ _dlerror_run (void (*operate) (void *), void *args)
result->errstring = NULL;
}
- result->errcode = _dl_catch_error (&result->objname, &result->errstring,
- operate, args);
+ result->errcode = GLRO(dl_catch_error) (&result->objname, &result->errstring,
+ operate, args);
/* If no error we mark that no error string is available. */
result->returned = result->errstring == NULL;
diff --git a/dlfcn/dlinfo.c b/dlfcn/dlinfo.c
index 37177f1f1b..7e7f1c759b 100644
--- a/dlfcn/dlinfo.c
+++ b/dlfcn/dlinfo.c
@@ -1,5 +1,5 @@
/* dlinfo -- Get information from the dynamic linker.
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@ dlinfo_doit (void *argsblock)
break;
if (l == NULL)
- _dl_signal_error (0, NULL, NULL, N_("\
+ GLRO(dl_signal_error) (0, NULL, NULL, N_("\
RTLD_SELF used in code not dynamically loaded"));
}
#endif
@@ -58,7 +58,7 @@ RTLD_SELF used in code not dynamically loaded"));
case RTLD_DI_LMID:
case RTLD_DI_CONFIGADDR:
default:
- _dl_signal_error (0, NULL, NULL, N_("unsupported dlinfo request"));
+ GLRO(dl_signal_error) (0, NULL, NULL, N_("unsupported dlinfo request"));
break;
case RTLD_DI_LINKMAP: