undo repvious delta

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 85d1416d6fd0cfcf6a53f8d32f6765a171f44c70..caba759b8f11094e35fe47791534b3b5a1af890b 100644 (file)
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31  Nick Clifton  <nickc@cygnus.com>
+
+       * gprof.h (_): Revert previous delta.  We want to use gettext,
+       not dgettext in the _ macro.
+
 2000-05-29  Alan Modra  <alan@linuxcare.com.au>
 
        * gprof.h (_): Use BFD version.

diff --git a/gprof/gprof.h b/gprof/gprof.h
index 983f0ac283b0ee8af2838ca2cd8070b817228fed..fdf9a28e4ac3af8f0b90ce1313f0267a339d4a3c 100644 (file)
--- a/gprof/gprof.h
+++ b/gprof/gprof.h
@@ -55,6 +55,12 @@
 # include <locale.h>
 #endif
 
+#ifdef ENABLE_NLS
+/* Undefine BFD's `_' macro - it uses dgetext() and we want to use gettext().  */
+#undef  _
+#define _(String) gettext (String)
+#endif
+
 #include "bin-bugs.h"
 
 /*