aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--stdlib/fmtmsg.h13
2 files changed, 9 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index effeb4193c..542f0cf9a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-08-21 Ulrich Drepper <drepper@cygnus.com>
+
+ * stdlib/fmtmsg.h: Don't define NULL to keep namespace clean.
+
1999-08-20 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/execve.c: Define weak alias execve.
diff --git a/stdlib/fmtmsg.h b/stdlib/fmtmsg.h
index b87644f0ee..56139b9a25 100644
--- a/stdlib/fmtmsg.h
+++ b/stdlib/fmtmsg.h
@@ -1,5 +1,5 @@
/* Message display handling.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999 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
@@ -22,9 +22,6 @@
#include <features.h>
-#define __need_NULL
-#include <stddef.h>
-
__BEGIN_DECLS
@@ -71,12 +68,12 @@ enum
/* Macros which can be used as null values for the arguments of `fmtmsg'. */
-#define MM_NULLLBL NULL
+#define MM_NULLLBL ((char *) 0)
#define MM_NULLSEV 0
#define MM_NULLMC ((long int) 0)
-#define MM_NULLTXT NULL
-#define MM_NULLACT NULL
-#define MM_NULLTAG NULL
+#define MM_NULLTXT ((char *) 0)
+#define MM_NULLACT ((char *) 0)
+#define MM_NULLTAG ((char *) 0)
/* Possible return values of `fmtmsg'. */