[PATCH] Remove FreeBSD specifics from RTEMS <arpa/inet.h>

[PATCH] Remove FreeBSD specifics from RTEMS <arpa/inet.h>

[Sebastian Huber]

For whatever reason FreeBSD renames several functions provided by
<arpa/inet.h> and uses weak references to provide the standard function
names.  This causes problems on targets lacking proper support for weak
references.  We do not need this function renaming on RTEMS.

Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
---
 newlib/libc/sys/rtems/include/arpa/inet.h | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/newlib/libc/sys/rtems/include/arpa/inet.h b/newlib/libc/sys/rtems/include/arpa/inet.h
index d71c92748..91e3a828a 100644
--- a/newlib/libc/sys/rtems/include/arpa/inet.h
+++ b/newlib/libc/sys/rtems/include/arpa/inet.h
@@ -112,27 +112,6 @@ struct in_addr {
 #define	_STRUCT_IN_ADDR_DECLARED
 #endif
 
-/* XXX all new diversions!! argh!! */
-#if __BSD_VISIBLE
-#define	inet_addr		__inet_addr
-#define	inet_aton		__inet_aton
-#define	inet_lnaof		__inet_lnaof
-#define	inet_makeaddr		__inet_makeaddr
-#define	inet_neta		__inet_neta
-#define	inet_netof		__inet_netof
-#define	inet_network		__inet_network
-#define	inet_net_ntop		__inet_net_ntop
-#define	inet_net_pton		__inet_net_pton
-#define	inet_cidr_ntop		__inet_cidr_ntop
-#define	inet_cidr_pton		__inet_cidr_pton
-#define	inet_ntoa		__inet_ntoa
-#define	inet_ntoa_r		__inet_ntoa_r
-#define	inet_pton		__inet_pton
-#define	inet_ntop		__inet_ntop
-#define	inet_nsap_addr		__inet_nsap_addr
-#define	inet_nsap_ntoa		__inet_nsap_ntoa
-#endif /* __BSD_VISIBLE */
-
 __BEGIN_DECLS
 #ifndef _BYTEORDER_PROTOTYPED
 #define	_BYTEORDER_PROTOTYPED
-- 
2.12.3

Re: [PATCH] Remove FreeBSD specifics from RTEMS <arpa/inet.h>

[Corinna Vinschen]

[-- Attachment #1: Type: text/plain, Size: 1822 bytes --]

On Jun 12 08:42, Sebastian Huber wrote:
> For whatever reason FreeBSD renames several functions provided by
> <arpa/inet.h> and uses weak references to provide the standard function
> names.  This causes problems on targets lacking proper support for weak
> references.  We do not need this function renaming on RTEMS.
> 
> Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
> ---
>  newlib/libc/sys/rtems/include/arpa/inet.h | 21 ---------------------
>  1 file changed, 21 deletions(-)
> 
> diff --git a/newlib/libc/sys/rtems/include/arpa/inet.h b/newlib/libc/sys/rtems/include/arpa/inet.h
> index d71c92748..91e3a828a 100644
> --- a/newlib/libc/sys/rtems/include/arpa/inet.h
> +++ b/newlib/libc/sys/rtems/include/arpa/inet.h
> @@ -112,27 +112,6 @@ struct in_addr {
>  #define	_STRUCT_IN_ADDR_DECLARED
>  #endif
>  
> -/* XXX all new diversions!! argh!! */
> -#if __BSD_VISIBLE
> -#define	inet_addr		__inet_addr
> -#define	inet_aton		__inet_aton
> -#define	inet_lnaof		__inet_lnaof
> -#define	inet_makeaddr		__inet_makeaddr
> -#define	inet_neta		__inet_neta
> -#define	inet_netof		__inet_netof
> -#define	inet_network		__inet_network
> -#define	inet_net_ntop		__inet_net_ntop
> -#define	inet_net_pton		__inet_net_pton
> -#define	inet_cidr_ntop		__inet_cidr_ntop
> -#define	inet_cidr_pton		__inet_cidr_pton
> -#define	inet_ntoa		__inet_ntoa
> -#define	inet_ntoa_r		__inet_ntoa_r
> -#define	inet_pton		__inet_pton
> -#define	inet_ntop		__inet_ntop
> -#define	inet_nsap_addr		__inet_nsap_addr
> -#define	inet_nsap_ntoa		__inet_nsap_ntoa
> -#endif /* __BSD_VISIBLE */
> -
>  __BEGIN_DECLS
>  #ifndef _BYTEORDER_PROTOTYPED
>  #define	_BYTEORDER_PROTOTYPED
> -- 
> 2.12.3

Please apply.


Thanks,
Corinna

-- 
Corinna Vinschen
Cygwin Maintainer
Red Hat

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]