summaryrefslogtreecommitdiffstats
path: root/lib/libc/include
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>2001-11-11 02:48:09 +0000
committerbde <bde@FreeBSD.org>2001-11-11 02:48:09 +0000
commiteb58f0f1a85857ed4be993a454e8aafed1b43b58 (patch)
tree9f56244d965dec1345589fb1aa8b7b147549c0dd /lib/libc/include
parentfdac350c9d2806675dca447df23111492108d0b9 (diff)
downloadFreeBSD-src-eb58f0f1a85857ed4be993a454e8aafed1b43b58.zip
FreeBSD-src-eb58f0f1a85857ed4be993a454e8aafed1b43b58.tar.gz
Fixed namespace pollution related to `err' in libc in the same way as for
`warn'. Now a whole 2 members of the err() family don't cause pollution. This fixes world breakage in awk for NOSHARED worlds. contrib/awk/msg.c has had its own version of err() for a long time, but this somehow didn't cause problems until the update to awk-3.1.0.
Diffstat (limited to 'lib/libc/include')
-rw-r--r--lib/libc/include/namespace.h1
-rw-r--r--lib/libc/include/un-namespace.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h
index 9d01520..68babbe 100644
--- a/lib/libc/include/namespace.h
+++ b/lib/libc/include/namespace.h
@@ -38,6 +38,7 @@
* ISO C (C90) section. Most names in libc aren't in ISO C, so they
* should be here. Most aren't here...
*/
+#define err _err
#define warn _warn
/*
diff --git a/lib/libc/include/un-namespace.h b/lib/libc/include/un-namespace.h
index 21f099c..855c101 100644
--- a/lib/libc/include/un-namespace.h
+++ b/lib/libc/include/un-namespace.h
@@ -136,6 +136,7 @@ int _kevent(int, const struct kevent *, int, struct kevent *,
int _flock(int, int);
#endif
+#undef err
#undef warn
#endif /* _UN_NAMESPACE_H_ */
OpenPOWER on IntegriCloud