include/uapi/linux/ipx.h: fix conflicting defitions with glibc netipx/ipx.h
Fixes these compiler warnings via libc-compat.h when glibc netipx/ipx.h is included before linux/ipx.h: ./linux/ipx.h:9:8: error: redefinition of ‘struct sockaddr_ipx’ ./linux/ipx.h:26:8: error: redefinition of ‘struct ipx_route_definition’ ./linux/ipx.h:32:8: error: redefinition of ‘struct ipx_interface_definition’ ./linux/ipx.h:49:8: error: redefinition of ‘struct ipx_config_data’ ./linux/ipx.h:58:8: error: redefinition of ‘struct ipx_route_def’ Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
a1d1f65ff5
commit
53dc65d4d3
@ -1,11 +1,13 @@
|
|||||||
#ifndef _IPX_H_
|
#ifndef _IPX_H_
|
||||||
#define _IPX_H_
|
#define _IPX_H_
|
||||||
|
#include <linux/libc-compat.h> /* for compatibility with glibc netipx/ipx.h */
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/sockios.h>
|
#include <linux/sockios.h>
|
||||||
#include <linux/socket.h>
|
#include <linux/socket.h>
|
||||||
#define IPX_NODE_LEN 6
|
#define IPX_NODE_LEN 6
|
||||||
#define IPX_MTU 576
|
#define IPX_MTU 576
|
||||||
|
|
||||||
|
#if __UAPI_DEF_SOCKADDR_IPX
|
||||||
struct sockaddr_ipx {
|
struct sockaddr_ipx {
|
||||||
__kernel_sa_family_t sipx_family;
|
__kernel_sa_family_t sipx_family;
|
||||||
__be16 sipx_port;
|
__be16 sipx_port;
|
||||||
@ -14,6 +16,7 @@ struct sockaddr_ipx {
|
|||||||
__u8 sipx_type;
|
__u8 sipx_type;
|
||||||
unsigned char sipx_zero; /* 16 byte fill */
|
unsigned char sipx_zero; /* 16 byte fill */
|
||||||
};
|
};
|
||||||
|
#endif /* __UAPI_DEF_SOCKADDR_IPX */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* So we can fit the extra info for SIOCSIFADDR into the address nicely
|
* So we can fit the extra info for SIOCSIFADDR into the address nicely
|
||||||
@ -23,12 +26,15 @@ struct sockaddr_ipx {
|
|||||||
#define IPX_DLTITF 0
|
#define IPX_DLTITF 0
|
||||||
#define IPX_CRTITF 1
|
#define IPX_CRTITF 1
|
||||||
|
|
||||||
|
#if __UAPI_DEF_IPX_ROUTE_DEFINITION
|
||||||
struct ipx_route_definition {
|
struct ipx_route_definition {
|
||||||
__be32 ipx_network;
|
__be32 ipx_network;
|
||||||
__be32 ipx_router_network;
|
__be32 ipx_router_network;
|
||||||
unsigned char ipx_router_node[IPX_NODE_LEN];
|
unsigned char ipx_router_node[IPX_NODE_LEN];
|
||||||
};
|
};
|
||||||
|
#endif /* __UAPI_DEF_IPX_ROUTE_DEFINITION */
|
||||||
|
|
||||||
|
#if __UAPI_DEF_IPX_INTERFACE_DEFINITION
|
||||||
struct ipx_interface_definition {
|
struct ipx_interface_definition {
|
||||||
__be32 ipx_network;
|
__be32 ipx_network;
|
||||||
unsigned char ipx_device[16];
|
unsigned char ipx_device[16];
|
||||||
@ -45,16 +51,20 @@ struct ipx_interface_definition {
|
|||||||
#define IPX_INTERNAL 2
|
#define IPX_INTERNAL 2
|
||||||
unsigned char ipx_node[IPX_NODE_LEN];
|
unsigned char ipx_node[IPX_NODE_LEN];
|
||||||
};
|
};
|
||||||
|
#endif /* __UAPI_DEF_IPX_INTERFACE_DEFINITION */
|
||||||
|
|
||||||
|
#if __UAPI_DEF_IPX_CONFIG_DATA
|
||||||
struct ipx_config_data {
|
struct ipx_config_data {
|
||||||
unsigned char ipxcfg_auto_select_primary;
|
unsigned char ipxcfg_auto_select_primary;
|
||||||
unsigned char ipxcfg_auto_create_interfaces;
|
unsigned char ipxcfg_auto_create_interfaces;
|
||||||
};
|
};
|
||||||
|
#endif /* __UAPI_DEF_IPX_CONFIG_DATA */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* OLD Route Definition for backward compatibility.
|
* OLD Route Definition for backward compatibility.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#if __UAPI_DEF_IPX_ROUTE_DEF
|
||||||
struct ipx_route_def {
|
struct ipx_route_def {
|
||||||
__be32 ipx_network;
|
__be32 ipx_network;
|
||||||
__be32 ipx_router_network;
|
__be32 ipx_router_network;
|
||||||
@ -67,6 +77,7 @@ struct ipx_route_def {
|
|||||||
#define IPX_RT_BLUEBOOK 2
|
#define IPX_RT_BLUEBOOK 2
|
||||||
#define IPX_RT_ROUTED 1
|
#define IPX_RT_ROUTED 1
|
||||||
};
|
};
|
||||||
|
#endif /* __UAPI_DEF_IPX_ROUTE_DEF */
|
||||||
|
|
||||||
#define SIOCAIPXITFCRT (SIOCPROTOPRIVATE)
|
#define SIOCAIPXITFCRT (SIOCPROTOPRIVATE)
|
||||||
#define SIOCAIPXPRISLT (SIOCPROTOPRIVATE + 1)
|
#define SIOCAIPXPRISLT (SIOCPROTOPRIVATE + 1)
|
||||||
|
@ -139,6 +139,25 @@
|
|||||||
|
|
||||||
#endif /* _NETINET_IN_H */
|
#endif /* _NETINET_IN_H */
|
||||||
|
|
||||||
|
/* Coordinate with glibc netipx/ipx.h header. */
|
||||||
|
#if defined(__NETIPX_IPX_H)
|
||||||
|
|
||||||
|
#define __UAPI_DEF_SOCKADDR_IPX 0
|
||||||
|
#define __UAPI_DEF_IPX_ROUTE_DEFINITION 0
|
||||||
|
#define __UAPI_DEF_IPX_INTERFACE_DEFINITION 0
|
||||||
|
#define __UAPI_DEF_IPX_CONFIG_DATA 0
|
||||||
|
#define __UAPI_DEF_IPX_ROUTE_DEF 0
|
||||||
|
|
||||||
|
#else /* defined(__NETIPX_IPX_H) */
|
||||||
|
|
||||||
|
#define __UAPI_DEF_SOCKADDR_IPX 1
|
||||||
|
#define __UAPI_DEF_IPX_ROUTE_DEFINITION 1
|
||||||
|
#define __UAPI_DEF_IPX_INTERFACE_DEFINITION 1
|
||||||
|
#define __UAPI_DEF_IPX_CONFIG_DATA 1
|
||||||
|
#define __UAPI_DEF_IPX_ROUTE_DEF 1
|
||||||
|
|
||||||
|
#endif /* defined(__NETIPX_IPX_H) */
|
||||||
|
|
||||||
/* Definitions for xattr.h */
|
/* Definitions for xattr.h */
|
||||||
#if defined(_SYS_XATTR_H)
|
#if defined(_SYS_XATTR_H)
|
||||||
#define __UAPI_DEF_XATTR 0
|
#define __UAPI_DEF_XATTR 0
|
||||||
@ -179,6 +198,13 @@
|
|||||||
#define __UAPI_DEF_IN6_PKTINFO 1
|
#define __UAPI_DEF_IN6_PKTINFO 1
|
||||||
#define __UAPI_DEF_IP6_MTUINFO 1
|
#define __UAPI_DEF_IP6_MTUINFO 1
|
||||||
|
|
||||||
|
/* Definitions for ipx.h */
|
||||||
|
#define __UAPI_DEF_SOCKADDR_IPX 1
|
||||||
|
#define __UAPI_DEF_IPX_ROUTE_DEFINITION 1
|
||||||
|
#define __UAPI_DEF_IPX_INTERFACE_DEFINITION 1
|
||||||
|
#define __UAPI_DEF_IPX_CONFIG_DATA 1
|
||||||
|
#define __UAPI_DEF_IPX_ROUTE_DEF 1
|
||||||
|
|
||||||
/* Definitions for xattr.h */
|
/* Definitions for xattr.h */
|
||||||
#define __UAPI_DEF_XATTR 1
|
#define __UAPI_DEF_XATTR 1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user