Use new framework for wrapping cat{open,gets,close}(), eliminating

_cat* in the process.

ok kettenis@

2 files changed, 2 insertions, 8 deletions

diff --git a/src/lib/libc/include/namespace.h b/src/lib/libc/include/namespace.h
index b0cad502a3..381ccc35be 100644
--- a/src/lib/libc/include/namespace.h
+++ b/src/lib/libc/include/namespace.h
@@ -1,12 +1,9 @@
-/*      $OpenBSD: namespace.h,v 1.3 2015/08/31 02:53:56 guenther Exp $  */
+/*      $OpenBSD: namespace.h,v 1.4 2015/09/05 11:25:30 guenther Exp $  */
 
 #ifndef _LIBC_NAMESPACE_H_
 #define _LIBC_NAMESPACE_H_
 
 /* These will be replaced with symbol renaming ala PROTO_NORMAL */
-#define catclose        _catclose
-#define catgets         _catgets
-#define catopen         _catopen
 #define strtoq          _strtoq
 #define strtouq         _strtouq
 #define sys_errlist     _sys_errlist
diff --git a/src/lib/libc/string/strerror_r.c b/src/lib/libc/string/strerror_r.c
index 90aa012360..2262cb512d 100644
--- a/src/lib/libc/string/strerror_r.c
+++ b/src/lib/libc/string/strerror_r.c
@@ -1,10 +1,7 @@
-/* $OpenBSD: strerror_r.c,v 1.9 2015/08/31 02:53:57 guenther Exp $ */
+/* $OpenBSD: strerror_r.c,v 1.10 2015/09/05 11:25:30 guenther Exp $ */
 /* Public Domain <marc@snafu.org> */
 
 #ifdef NLS
-#define catclose        _catclose
-#define catgets         _catgets
-#define catopen         _catopen
 #include <nl_types.h>
 #endif