summaryrefslogtreecommitdiffstats
path: root/lib/libc/include
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>2001-08-29 13:52:27 +0000
committerbde <bde@FreeBSD.org>2001-08-29 13:52:27 +0000
commit92c57599167493c3bef125d0aa3416a4f3abf082 (patch)
tree4587fdf85fbc795e0cbf9e3c4a511da739cd65a8 /lib/libc/include
parent40c9b9ae1a590b90d8f9b5d53e9ca022f2a51b40 (diff)
downloadFreeBSD-src-92c57599167493c3bef125d0aa3416a4f3abf082.zip
FreeBSD-src-92c57599167493c3bef125d0aa3416a4f3abf082.tar.gz
Fixed namespace pollution related to `warn' in libc (but not in other
libraries or for other members of the err() family). This fixes world breakage in bc and rcs/* for NOSHARED worlds.
Diffstat (limited to 'lib/libc/include')
-rw-r--r--lib/libc/include/namespace.h10
-rw-r--r--lib/libc/include/un-namespace.h2
2 files changed, 12 insertions, 0 deletions
diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h
index 470243b..59143f6 100644
--- a/lib/libc/include/namespace.h
+++ b/lib/libc/include/namespace.h
@@ -31,6 +31,16 @@
#define _NAMESPACE_H_
/*
+ * Adjust names so that headers declare "hidden" names.
+ */
+
+/*
+ * ISO C (C90) section. Most names in libc aren't in ISO C, so they
+ * should be here. Most aren't here...
+ */
+#define warn _warn
+
+/*
* Prototypes for syscalls/functions that need to be overridden
* in libc_r/libpthread.
*/
diff --git a/lib/libc/include/un-namespace.h b/lib/libc/include/un-namespace.h
index c7a5724..9290a99 100644
--- a/lib/libc/include/un-namespace.h
+++ b/lib/libc/include/un-namespace.h
@@ -137,4 +137,6 @@ int _kevent(int, const struct kevent *, int, struct kevent *,
int _flock(int, int);
#endif
+#undef warn
+
#endif /* _UN_NAMESPACE_H_ */
OpenPOWER on IntegriCloud