diff --git a/headers/posix/arpa/inet.h b/headers/posix/arpa/inet.h index 505a6b4bb8..fe9f211939 100644 --- a/headers/posix/arpa/inet.h +++ b/headers/posix/arpa/inet.h @@ -55,21 +55,16 @@ /* * @(#)inet.h 8.1 (Berkeley) 6/2/93 - * $Id: inet.h,v 1.5 2004/04/15 15:54:34 wkornew Exp $ + * $Id: inet.h,v 1.6 2004/05/13 00:56:00 phoudoin Exp $ */ #ifndef _INET_H_ #define _INET_H_ -/* External definitions for functions in inet(3) */ +#include +#include -#include -#if (!defined(BSD)) || (BSD < 199306) -# include -#else -# include -#endif -#include +/* External definitions for functions in inet(3) */ /* R5 libnet.so does not have "__" prefix. */ #ifndef BUILDING_R5_LIBNET @@ -91,23 +86,30 @@ #define inet_nsap_ntoa __inet_nsap_ntoa #endif -__BEGIN_DECLS -unsigned long inet_addr __P((const char *)); -int inet_aton __P((const char *, struct in_addr *)); -unsigned long inet_lnaof __P((struct in_addr)); -struct in_addr inet_makeaddr __P((u_long , u_long)); -char * inet_neta __P((u_long, char *, size_t)); -unsigned long inet_netof __P((struct in_addr)); -unsigned long 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)); -char *inet_cidr_ntop __P((int, const void *, int, char *, size_t)); -int inet_cidr_pton __P((int, const char *, void *, int *)); -/*const*/ char *inet_ntoa __P((struct in_addr)); -int inet_pton __P((int, const char *, void *)); -const char *inet_ntop __P((int, const void *, char *, size_t)); -u_int inet_nsap_addr __P((const char *, u_char *, int)); -char *inet_nsap_ntoa __P((int, const u_char *, char *)); -__END_DECLS +#ifdef __cplusplus +extern "C" { +#endif + +unsigned long inet_addr(const char *); +int inet_aton(const char *, struct in_addr *); +unsigned long inet_lnaof(struct in_addr); +struct in_addr inet_makeaddr(u_long , u_long); +char * inet_neta(u_long, char *, size_t); +unsigned long inet_netof(struct in_addr); +unsigned long 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); +char *inet_cidr_ntop(int, const void *, int, char *, size_t); +int inet_cidr_pton(int, const char *, void *, int *); +/*const*/ char *inet_ntoa(struct in_addr); +int inet_pton(int, const char *, void *); +const char *inet_ntop(int, const void *, char *, size_t); +u_int inet_nsap_addr(const char *, u_char *, int); +char *inet_nsap_ntoa(int, const u_char *, char *); + +#ifdef __cplusplus +} +#endif + #endif /* !_INET_H_ */