summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2002-11-22 10:28:44 +0000
committerJim Meyering <jim@meyering.net>2002-11-22 10:28:44 +0000
commit70641e502dc2c5efdf2019bf86232acb7c4b5907 (patch)
tree00b64dcd9bc61a5f74977e9ab126263cb8ff4a00 /lib
parentcc92325877ab6ca0133ba4f0f6cc61d7d269285d (diff)
downloadcoreutils-70641e502dc2c5efdf2019bf86232acb7c4b5907.tar.xz
Change compile-time error message. Add comment about
required autoconf version. Include gettext.h instead of <libintl.h>. (textdomain): Remove definition.
Diffstat (limited to 'lib')
-rw-r--r--lib/xmalloc.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index bc6c0bd14..3affee7a9 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -30,14 +30,9 @@ void *realloc ();
void free ();
#endif
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# define textdomain(Domain)
-# define _(Text) Text
-#endif
-#define N_(Text) Text
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
#include "error.h"
#include "xalloc.h"
@@ -46,12 +41,14 @@ void free ();
# define EXIT_FAILURE 1
#endif
+/* The following tests require AC_PREREQ(2.54). */
+
#ifndef HAVE_MALLOC
-"you must run the autoconf test for a properly working malloc"
+"you must run the autoconf test for a GNU libc compatible malloc"
#endif
#ifndef HAVE_REALLOC
-"you must run the autoconf test for a properly working realloc"
+"you must run the autoconf test for a GNU libc compatible realloc"
#endif
/* Exit value when the requested amount of memory is not available.