aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--argp/argp-help.c4
-rw-r--r--elf/dl-load.c10
3 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 9795851fa9..dc4d7f7e27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-03-06 Ulrich Drepper <drepper@cygnus.com>
+
+ * argp/argp-help.c: Remove last bits of using gettext instead of
+ dgettext.
+
1998-03-06 17:04 Ulrich Drepper <drepper@cygnus.com>
* libc.map: Add _dl_debug_impcalls, _dl_debug_fd, _dl_sysdep_output,
diff --git a/argp/argp-help.c b/argp/argp-help.c
index b1e6ee31cc..09daa63068 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -31,13 +31,11 @@
#include <ctype.h>
#ifndef _
-/* This is for other GNU distributions with internationalized messages.
- When compiling libc, the _ macro is predefined. */
+/* This is for other GNU distributions with internationalized messages. */
#ifdef HAVE_LIBINTL_H
# include <libintl.h>
#else
# define dgettext(domain, msgid) (msgid)
-# define gettext(msgid) (msgid)
#endif
#endif
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 71373440fe..f91a7ae4d3 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -805,7 +805,7 @@ print_search_path (struct r_search_path_elem **list,
{
int first = 1;
- _dl_sysdep_message ("\t search path=", NULL);
+ _dl_debug_message ("\t search path=", NULL);
while (*list != NULL && (*list)->what == what) /* Yes, ==. */
{
@@ -814,23 +814,23 @@ print_search_path (struct r_search_path_elem **list,
if ((*list)->machdirstatus != nonexisting)
{
buf[(*list)->machdirnamelen - 1] = '\0';
- _dl_sysdep_message (first ? "" : ":", buf, NULL);
+ _dl_debug_message (first ? "" : ":", buf, NULL);
first = 0;
}
if ((*list)->dirstatus != nonexisting)
{
buf[(*list)->dirnamelen - 1] = '\0';
- _dl_sysdep_message (first ? "" : ":", buf, NULL);
+ _dl_debug_message (first ? "" : ":", buf, NULL);
first = 0;
}
++list;
}
if (name != NULL)
- _dl_sysdep_message ("\t\t(", what, " from file ",
+ _dl_debug_message ("\t\t(", what, " from file ",
name[0] ? name : _dl_argv[0], ")\n", NULL);
else
- _dl_sysdep_message ("\t\t(", what, ")\n", NULL);
+ _dl_debug_message ("\t\t(", what, ")\n", NULL);
}
/* Try to open NAME in one of the directories in DIRS.