Revert: finger slip

src/include/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.204 2015/09/14 08:16:14 guenther Exp $
+#	$OpenBSD: Makefile,v 1.205 2015/09/14 08:24:37 guenther Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -117,9 +117,6 @@ copies:
 		${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \
 			${DESTDIR}/usr/include/$$i ; \
 	done
-	${MAKE} just-sys
-
-just-sys:
 	cd ../sys; \
 	pax -rw -pa -L \
 	    `find ${LDIRS} -follow -type f -name '*.h' '!' \

src/include/arpa/inet.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet.h,v 1.18 2015/09/14 08:16:14 guenther Exp $	*/
+/*	$OpenBSD: inet.h,v 1.19 2015/09/14 08:24:37 guenther Exp $	*/
 
 /*
  * ++Copyright++ 1983, 1993
@@ -61,9 +61,9 @@
 
 /* External definitions for functions in inet(3) */
 
-#include <sys/cdefs.h>
-#include <sys/_endian.h>
+#include <sys/types.h>
 
+/* <sys/_endian.h> is pulled in by <sys/types.h> */
 #ifndef htons
 #define htons(x)	__htobe16(x)
 #define htonl(x)	__htobe32(x)
@@ -76,12 +76,6 @@
 typedef	__socklen_t	socklen_t;	/* length type for network syscalls */
 #endif
 
-#ifndef _IN_TYPES_DEFINED_
-#define _IN_TYPES_DEFINED_
-typedef __in_addr_t	in_addr_t;	/* base type for internet address */
-typedef __in_port_t	in_port_t;	/* IP port type */
-#endif
-
 /*
  * Buffer lengths for strings containing printable IP addresses
  */
@@ -103,15 +97,6 @@ struct in_addr {
 #endif
 
 
-#if __BSD_VISIBLE
-/* need this for the non-standard stuff */
-#ifndef _SIZE_T_DEFINED_
-#define _SIZE_T_DEFINED_
-typedef __size_t	size_t;
-#endif
-#endif
-
-
 __BEGIN_DECLS
 in_addr_t	 inet_addr(const char *);
 char		*inet_ntoa(struct in_addr);