ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

kernel-wfp: Declare constants explicitly as extern 

Newer compilers otherwise complain that there are multiple definitions
of these (in header and .c file).
This commit is contained in:
Tobias Brunner 2020-11-13 11:44:21 +01:00
parent 4fc6b79b93
commit ce433c9b29
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/libcharon/plugins/kernel_wfp/kernel_wfp_compat.h
View File

@ -108,49 +108,49 @@ enum {
}; };
/* missing in some MinGW versions */ /* missing in some MinGW versions */
const GUID FWPM_CONDITION_IP_REMOTE_ADDRESS; extern const GUID FWPM_CONDITION_IP_REMOTE_ADDRESS;
const GUID FWPM_CONDITION_IP_LOCAL_ADDRESS; extern const GUID FWPM_CONDITION_IP_LOCAL_ADDRESS;
const GUID FWPM_CONDITION_IP_SOURCE_ADDRESS; extern const GUID FWPM_CONDITION_IP_SOURCE_ADDRESS;
const GUID FWPM_CONDITION_IP_DESTINATION_ADDRESS; extern const GUID FWPM_CONDITION_IP_DESTINATION_ADDRESS;
const GUID FWPM_CONDITION_IP_LOCAL_PORT; extern const GUID FWPM_CONDITION_IP_LOCAL_PORT;
const GUID FWPM_CONDITION_IP_REMOTE_PORT; extern const GUID FWPM_CONDITION_IP_REMOTE_PORT;
const GUID FWPM_CONDITION_IP_PROTOCOL; extern const GUID FWPM_CONDITION_IP_PROTOCOL;
#ifndef FWPM_CONDITION_ICMP_TYPE #ifndef FWPM_CONDITION_ICMP_TYPE
# define FWPM_CONDITION_ICMP_TYPE FWPM_CONDITION_IP_LOCAL_PORT # define FWPM_CONDITION_ICMP_TYPE FWPM_CONDITION_IP_LOCAL_PORT
#endif #endif
#ifndef FWPM_CONDITION_ICMP_CODE #ifndef FWPM_CONDITION_ICMP_CODE
# define FWPM_CONDITION_ICMP_CODE FWPM_CONDITION_IP_REMOTE_PORT # define FWPM_CONDITION_ICMP_CODE FWPM_CONDITION_IP_REMOTE_PORT
#endif #endif
const GUID FWPM_LAYER_INBOUND_TRANSPORT_V4; extern const GUID FWPM_LAYER_INBOUND_TRANSPORT_V4;
const GUID FWPM_LAYER_INBOUND_TRANSPORT_V6; extern const GUID FWPM_LAYER_INBOUND_TRANSPORT_V6;
const GUID FWPM_LAYER_OUTBOUND_TRANSPORT_V4; extern const GUID FWPM_LAYER_OUTBOUND_TRANSPORT_V4;
const GUID FWPM_LAYER_OUTBOUND_TRANSPORT_V6; extern const GUID FWPM_LAYER_OUTBOUND_TRANSPORT_V6;
const GUID FWPM_LAYER_IPFORWARD_V4; extern const GUID FWPM_LAYER_IPFORWARD_V4;
const GUID FWPM_LAYER_IPFORWARD_V6; extern const GUID FWPM_LAYER_IPFORWARD_V6;
const GUID FWPM_LAYER_ALE_AUTH_CONNECT_V4; extern const GUID FWPM_LAYER_ALE_AUTH_CONNECT_V4;
const GUID FWPM_LAYER_ALE_AUTH_CONNECT_V6; extern const GUID FWPM_LAYER_ALE_AUTH_CONNECT_V6;
const GUID FWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V4; extern const GUID FWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V4;
const GUID FWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V6; extern const GUID FWPM_LAYER_ALE_AUTH_RECV_ACCEPT_V6;
const GUID FWPM_SUBLAYER_IPSEC_TUNNEL; extern const GUID FWPM_SUBLAYER_IPSEC_TUNNEL;
const GUID FWPM_SUBLAYER_IPSEC_FORWARD_OUTBOUND_TUNNEL; extern const GUID FWPM_SUBLAYER_IPSEC_FORWARD_OUTBOUND_TUNNEL;
const GUID FWPM_CALLOUT_IPSEC_INBOUND_TRANSPORT_V4; extern const GUID FWPM_CALLOUT_IPSEC_INBOUND_TRANSPORT_V4;
const GUID FWPM_CALLOUT_IPSEC_INBOUND_TRANSPORT_V6; extern const GUID FWPM_CALLOUT_IPSEC_INBOUND_TRANSPORT_V6;
const GUID FWPM_CALLOUT_IPSEC_OUTBOUND_TRANSPORT_V4; extern const GUID FWPM_CALLOUT_IPSEC_OUTBOUND_TRANSPORT_V4;
const GUID FWPM_CALLOUT_IPSEC_OUTBOUND_TRANSPORT_V6; extern const GUID FWPM_CALLOUT_IPSEC_OUTBOUND_TRANSPORT_V6;
const GUID FWPM_CALLOUT_IPSEC_INBOUND_TUNNEL_V4; extern const GUID FWPM_CALLOUT_IPSEC_INBOUND_TUNNEL_V4;
const GUID FWPM_CALLOUT_IPSEC_INBOUND_TUNNEL_V6; extern const GUID FWPM_CALLOUT_IPSEC_INBOUND_TUNNEL_V6;
const GUID FWPM_CALLOUT_IPSEC_OUTBOUND_TUNNEL_V4; extern const GUID FWPM_CALLOUT_IPSEC_OUTBOUND_TUNNEL_V4;
const GUID FWPM_CALLOUT_IPSEC_OUTBOUND_TUNNEL_V6; extern const GUID FWPM_CALLOUT_IPSEC_OUTBOUND_TUNNEL_V6;
const GUID FWPM_CALLOUT_IPSEC_FORWARD_INBOUND_TUNNEL_V4; extern const GUID FWPM_CALLOUT_IPSEC_FORWARD_INBOUND_TUNNEL_V4;
const GUID FWPM_CALLOUT_IPSEC_FORWARD_INBOUND_TUNNEL_V6; extern const GUID FWPM_CALLOUT_IPSEC_FORWARD_INBOUND_TUNNEL_V6;
const GUID FWPM_CALLOUT_IPSEC_FORWARD_OUTBOUND_TUNNEL_V4; extern const GUID FWPM_CALLOUT_IPSEC_FORWARD_OUTBOUND_TUNNEL_V4;
const GUID FWPM_CALLOUT_IPSEC_FORWARD_OUTBOUND_TUNNEL_V6; extern const GUID FWPM_CALLOUT_IPSEC_FORWARD_OUTBOUND_TUNNEL_V6;
const GUID FWPM_CALLOUT_IPSEC_ALE_CONNECT_V4; extern const GUID FWPM_CALLOUT_IPSEC_ALE_CONNECT_V4;
const GUID FWPM_CALLOUT_IPSEC_ALE_CONNECT_V6; extern const GUID FWPM_CALLOUT_IPSEC_ALE_CONNECT_V6;
const GUID FWPM_CALLOUT_IPSEC_INBOUND_TUNNEL_ALE_ACCEPT_V4; extern const GUID FWPM_CALLOUT_IPSEC_INBOUND_TUNNEL_ALE_ACCEPT_V4;
const GUID FWPM_CALLOUT_IPSEC_INBOUND_TUNNEL_ALE_ACCEPT_V6; extern const GUID FWPM_CALLOUT_IPSEC_INBOUND_TUNNEL_ALE_ACCEPT_V6;
const GUID FWPM_CALLOUT_IPSEC_INBOUND_INITIATE_SECURE_V4; extern const GUID FWPM_CALLOUT_IPSEC_INBOUND_INITIATE_SECURE_V4;
const GUID FWPM_CALLOUT_IPSEC_INBOUND_INITIATE_SECURE_V6; extern const GUID FWPM_CALLOUT_IPSEC_INBOUND_INITIATE_SECURE_V6;
/* integrity config, missing in some MinGW versions */ /* integrity config, missing in some MinGW versions */
#ifndef IPSEC_AUTH_CONFIG_HMAC_MD5_96 #ifndef IPSEC_AUTH_CONFIG_HMAC_MD5_96