Breath deep and take __P out of the system include files.

# This appears to not break X11, but I'm having problems compiling the
# glide part of the server with or without this patch, so I can't tell
# for sure.

2 files changed, 45 insertions, 45 deletions

diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 42daebf..5a0e814 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -130,31 +130,31 @@ struct in_addr {
 __BEGIN_DECLS
 #ifndef _BYTEORDER_PROTOTYPED
 #define	_BYTEORDER_PROTOTYPED
-__uint32_t	 htonl __P((__uint32_t));
-__uint16_t	 htons __P((__uint16_t));
-__uint32_t	 ntohl __P((__uint32_t));
-__uint16_t	 ntohs __P((__uint16_t));
+__uint32_t	 htonl(__uint32_t);
+__uint16_t	 htons(__uint16_t);
+__uint32_t	 ntohl(__uint32_t);
+__uint16_t	 ntohs(__uint16_t);
 #endif
 
-in_addr_t	 inet_addr __P((const char *));
-char		*inet_ntoa __P((struct in_addr));
-const char	*inet_ntop __P((int, const void *, char *, socklen_t));
-int		 inet_pton __P((int, const char *, void *));
+in_addr_t	 inet_addr(const char *);
+char		*inet_ntoa(struct in_addr);
+const char	*inet_ntop(int, const void *, char *, socklen_t);
+int		 inet_pton(int, const char *, void *);
 
 /* Nonstandard functions. */
 #ifndef _POSIX_SOURCE
-int		 ascii2addr __P((int, const char *, void *));
-char		*addr2ascii __P((int, const void *, int, char *));
-int		 inet_aton __P((const char *, struct in_addr *));
-in_addr_t	 inet_lnaof __P((struct in_addr));
-struct in_addr	 inet_makeaddr __P((in_addr_t, in_addr_t));
-char *		 inet_neta __P((in_addr_t, char *, size_t));
-in_addr_t	 inet_netof __P((struct in_addr));
-in_addr_t	 inet_network __P((const char *));
-char		*inet_net_ntop __P((int, const void *, int, char *, size_t));
-int		 inet_net_pton __P((int, const char *, void *, size_t));
-unsigned	 inet_nsap_addr __P((const char *, unsigned char *, int));
-char		*inet_nsap_ntoa __P((int, const unsigned char *, char *));
+int		 ascii2addr(int, const char *, void *);
+char		*addr2ascii(int, const void *, int, char *);
+int		 inet_aton(const char *, struct in_addr *);
+in_addr_t	 inet_lnaof(struct in_addr);
+struct in_addr	 inet_makeaddr(in_addr_t, in_addr_t);
+char *		 inet_neta(in_addr_t, char *, size_t);
+in_addr_t	 inet_netof(struct in_addr);
+in_addr_t	 inet_network(const char *);
+char		*inet_net_ntop(int, const void *, int, char *, size_t);
+int		 inet_net_pton(int, const char *, void *, size_t);
+unsigned	 inet_nsap_addr(const char *, unsigned char *, int);
+char		*inet_nsap_ntoa(int, const unsigned char *, char *);
 #endif /* !_POSIX_SOURCE */
 __END_DECLS
 
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index 343e641..99b51c2 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -415,31 +415,31 @@ typedef enum __ns_class {
 #define	ns_name_uncompress	__ns_name_uncompress
 
 __BEGIN_DECLS
-u_int		ns_get16 __P((const u_char *));
-u_long		ns_get32 __P((const u_char *));
-void		ns_put16 __P((u_int, u_char *));
-void		ns_put32 __P((u_long, u_char *));
-int		ns_initparse __P((const u_char *, int, ns_msg *));
-int		ns_parserr __P((ns_msg *, ns_sect, int, ns_rr *));
-int		ns_sprintrr __P((const ns_msg *, const ns_rr *,
-				 const char *, const char *, char *, size_t));
-int		ns_sprintrrf __P((const u_char *, size_t, const char *,
-				  ns_class, ns_type, u_long, const u_char *,
-				  size_t, const char *, const char *,
-				  char *, size_t));
-int		ns_format_ttl __P((u_long, char *, size_t));
-int		ns_parse_ttl __P((const char *, u_long *));
-int		ns_name_ntop __P((const u_char *, char *, size_t));
-int		ns_name_pton __P((const char *, u_char *, size_t));
-int		ns_name_unpack __P((const u_char *, const u_char *,
-				    const u_char *, u_char *, size_t));
-int		ns_name_pack __P((const u_char *, u_char *, int,
-				  const u_char **, const u_char **));
-int		ns_name_uncompress __P((const u_char *, const u_char *,
-					const u_char *, char *, size_t));
-int		ns_name_compress __P((const char *, u_char *, size_t,
-				      const u_char **, const u_char **));
-int		ns_name_skip __P((const u_char **, const u_char *));
+u_int		ns_get16(const u_char *);
+u_long		ns_get32(const u_char *);
+void		ns_put16(u_int, u_char *);
+void		ns_put32(u_long, u_char *);
+int		ns_initparse(const u_char *, int, ns_msg *);
+int		ns_parserr(ns_msg *, ns_sect, int, ns_rr *);
+int		ns_sprintrr(const ns_msg *, const ns_rr *,
+			    const char *, const char *, char *, size_t);
+int		ns_sprintrrf(const u_char *, size_t, const char *,
+			     ns_class, ns_type, u_long, const u_char *,
+			     size_t, const char *, const char *,
+			     char *, size_t);
+int		ns_format_ttl(u_long, char *, size_t);
+int		ns_parse_ttl(const char *, u_long *);
+int		ns_name_ntop(const u_char *, char *, size_t);
+int		ns_name_pton(const char *, u_char *, size_t);
+int		ns_name_unpack(const u_char *, const u_char *,
+			       const u_char *, u_char *, size_t);
+int		ns_name_pack(const u_char *, u_char *, int,
+			     const u_char **, const u_char **);
+int		ns_name_uncompress(const u_char *, const u_char *,
+				   const u_char *, char *, size_t);
+int		ns_name_compress(const char *, u_char *, size_t,
+				 const u_char **, const u_char **);
+int		ns_name_skip(const u_char **, const u_char *);
 __END_DECLS
 
 #ifdef BIND_4_COMPAT