Use PROTO_NORMAL() on __syscall to go direct, adjusting the declaration

to eliminate some casts.
Retire some uses of old-style STUB* macros where superseded by namespace.h bits

tweaks and ok deraadt@

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/libc/sys/preadv.c b/lib/libc/sys/preadv.c
index 238364ddd75..5e008f47ce1 100644
--- a/lib/libc/sys/preadv.c
+++ b/lib/libc/sys/preadv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: preadv.c,v 1.9 2011/10/16 06:29:56 guenther Exp $	*/
+/*	$OpenBSD: preadv.c,v 1.10 2015/09/11 13:26:20 guenther Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -29,15 +29,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
 #include <sys/syscall.h>
 #include <sys/uio.h>
 #include <unistd.h>
 #include "thread_private.h"
 
-register_t __syscall(quad_t, ...);
+ssize_t	__syscall(quad_t, ...);
+PROTO_NORMAL(__syscall);
 
-/* preadv is weak to support libpthread cancellation */
 
 STUB_PROTOTYPE(preadv);
 
@@ -50,6 +49,5 @@ STUB_ALIAS(preadv);
 ssize_t
 STUB_NAME(preadv)(int fd, const struct iovec *iovp, int iovcnt, off_t offset)
 {
-
-	return (__syscall((quad_t)SYS_preadv, fd, iovp, iovcnt, 0, offset));
+	return (__syscall(SYS_preadv, fd, iovp, iovcnt, 0, offset));
 }