8 files changed, 4 insertions, 31 deletions

diff --git a/lib/libc/alpha/SYS.h b/lib/libc/alpha/SYS.h
index 5d28260f9380..5365e670bf8a 100644
--- a/lib/libc/alpha/SYS.h
+++ b/lib/libc/alpha/SYS.h
@@ -30,11 +30,7 @@
  */
 
 #include <machine/asm.h>
-#ifdef __NETBSD_SYSCALLS
-#include <sys/netbsd_syscall.h>
-#else
 #include <sys/syscall.h>
-#endif
 
 #define	CALLSYS_ERROR(name)					\
 	CALLSYS_NOERROR(name);					\
diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c
index 1ca0efc72852..6606af7463a7 100644
--- a/lib/libc/gen/getcwd.c
+++ b/lib/libc/gen/getcwd.c
@@ -95,7 +95,6 @@ getcwd(pt, size)
 			return (NULL);
 		ept = pt + ptsize;
 	}
-#if	!defined(__NETBSD_SYSCALLS)
 	if (__getcwd(pt, ept - pt) == 0) {
 		if (*pt != '/') {
 			bpt = pt;
@@ -108,7 +107,6 @@ getcwd(pt, size)
 		}
 		return (pt);
 	}
-#endif
 	bpt = ept - 1;
 	*bpt = '\0';
 
diff --git a/lib/libc/gen/getlogin.c b/lib/libc/gen/getlogin.c
index 664f208831dd..92af0d18555a 100644
--- a/lib/libc/gen/getlogin.c
+++ b/lib/libc/gen/getlogin.c
@@ -64,11 +64,7 @@ getlogin_basic(int *status)
 	static char logname[MAXLOGNAME];
 
 	if (_logname_valid == 0) {
-#ifdef __NETBSD_SYSCALLS
-		if (_getlogin(logname, sizeof(logname) - 1) < 0) {
-#else
 		if (_getlogin(logname, sizeof(logname)) < 0) {
-#endif
 			*status = errno;
 			return (NULL);
 		}
diff --git a/lib/libc/gen/getvfsbyname.c b/lib/libc/gen/getvfsbyname.c
index 3ab03f4de83b..20f389dd35f0 100644
--- a/lib/libc/gen/getvfsbyname.c
+++ b/lib/libc/gen/getvfsbyname.c
@@ -53,9 +53,6 @@ getvfsbyname(fsname, vfcp)
 	const char *fsname;
 	struct xvfsconf *vfcp;
 {
-#ifdef	__NETBSD_SYSCALLS
-	errno = ENOSYS;
-#else
 	struct xvfsconf *xvfsp;
 	size_t buflen;
 	int cnt, i;
@@ -79,6 +76,5 @@ getvfsbyname(fsname, vfcp)
 	}
 	free(xvfsp);
 	errno = ENOENT;
-#endif
 	return (-1);
 }
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index 5e159dd9ef9c..17f67f83bea4 100644
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -375,10 +375,7 @@ globtilde(pattern, patbuf, patbuf_len, pglob)
 		 * we're not running setuid or setgid) and then trying
 		 * the password file
 		 */
-		if (
-#ifndef	__NETBSD_SYSCALLS
-		    issetugid() != 0 ||
-#endif
+		if (issetugid() != 0 ||
 		    (h = getenv("HOME")) == NULL) {
 			if (((h = getlogin()) != NULL &&
 			     (pwd = getpwnam(h)) != NULL) ||
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
index 70e727861f7b..6829ae5bf2e3 100644
--- a/lib/libc/locale/setlocale.c
+++ b/lib/libc/locale/setlocale.c
@@ -308,11 +308,7 @@ __detect_path_locale(void)
 	if (_PathLocale == NULL) {
 		char *p = getenv("PATH_LOCALE");
 
-		if (p != NULL
-#ifndef __NETBSD_SYSCALLS
-			&& !issetugid()
-#endif
-			) {
+		if (p != NULL && !issetugid()) {
 			if (strlen(p) + 1/*"/"*/ + ENCODING_LEN +
 			    1/*"/"*/ + CATEGORY_LEN >= PATH_MAX)
 				return (ENAMETOOLONG);
diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c
index 4d446184eafd..86fba82692cf 100644
--- a/lib/libc/nls/msgcat.c
+++ b/lib/libc/nls/msgcat.c
@@ -111,11 +111,7 @@ catopen(name, type)
 		pcode = cptr;
 	}
 
-	if ((nlspath = getenv("NLSPATH")) == NULL
-#ifndef __NETBSD_SYSCALLS
-	    || issetugid()
-#endif
-	   )
+	if ((nlspath = getenv("NLSPATH")) == NULL || issetugid())
 		nlspath = _DEFAULT_NLS_PATH;
 
 	if ((base = cptr = strdup(nlspath)) == NULL) {
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 41c41a3c52e0..7006df261e55 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -66,9 +66,7 @@ __FBSDID("$FreeBSD$");
 #       define malloc_pageshift		12U
 #       define malloc_minsize		16U
 #   endif
-#   if !defined(__NETBSD_SYSCALLS)
-#       define HAS_UTRACE
-#   endif
+#   define HAS_UTRACE
     /*
      * Make malloc/free/realloc thread-safe in libc for use with
      * kernel threads.