diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2021-08-13 00:40:05 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2021-08-13 00:40:05 -0700 |
| commit | 431c3b6ffa136fef8c98e385a76378345e49b3e1 (patch) | |
| tree | 38ba655cecce14bdc64ccf7ac0b8060f1ee43ae0 | |
| parent | 4ae199cdd9e06358651ed62141d485dae3e2e57a (diff) | |
| parent | 5725c81fc9c14b8faf384dfcf302efcf92621a0a (diff) | |
Merge 5725c81fc9c14b8faf384dfcf302efcf92621a0a on remote branch
Change-Id: I2f97e180a60c7a95e0a0a93696915ca1cbb0a1d8
| -rw-r--r-- | ipacm/inc/IPACM_ConntrackClient.h | 3 | ||||
| -rw-r--r-- | ipacm/inc/IPACM_ConntrackListener.h | 3 | ||||
| -rw-r--r-- | ipacm/inc/IPACM_Netlink.h | 1 | ||||
| -rw-r--r-- | ipacm/inc/IPACM_Xml.h | 3 | ||||
| -rw-r--r-- | ipacm/src/IPACM_ConntrackClient.cpp | 3 | ||||
| -rw-r--r-- | ipacm/src/IPACM_Xml.cpp | 3 |
6 files changed, 15 insertions, 1 deletions
diff --git a/ipacm/inc/IPACM_ConntrackClient.h b/ipacm/inc/IPACM_ConntrackClient.h index 16d5b9c..4ceff43 100644 --- a/ipacm/inc/IPACM_ConntrackClient.h +++ b/ipacm/inc/IPACM_ConntrackClient.h @@ -33,6 +33,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <stdio.h> #include <stdlib.h> #include <string.h> +#ifndef in_addr_t +typedef uint32_t in_addr_t; +#endif #include <arpa/inet.h> #include <netinet/in.h> #include <errno.h> diff --git a/ipacm/inc/IPACM_ConntrackListener.h b/ipacm/inc/IPACM_ConntrackListener.h index 2977af7..110fdcc 100644 --- a/ipacm/inc/IPACM_ConntrackListener.h +++ b/ipacm/inc/IPACM_ConntrackListener.h @@ -35,6 +35,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <string.h> #include <fcntl.h> +#ifndef in_addr_t +typedef uint32_t in_addr_t; +#endif #include <arpa/inet.h> #include <netinet/in.h> #include <errno.h> diff --git a/ipacm/inc/IPACM_Netlink.h b/ipacm/inc/IPACM_Netlink.h index 81f1968..ae3ab3f 100644 --- a/ipacm/inc/IPACM_Netlink.h +++ b/ipacm/inc/IPACM_Netlink.h @@ -52,7 +52,6 @@ extern "C" #include <sys/select.h> #include <sys/socket.h> #include <linux/socket.h> -#include <inaddr.h> #define sockaddr_storage __kernel_sockaddr_storage #include <linux/if.h> #include <linux/if_addr.h> diff --git a/ipacm/inc/IPACM_Xml.h b/ipacm/inc/IPACM_Xml.h index 64c00ed..5954e1b 100644 --- a/ipacm/inc/IPACM_Xml.h +++ b/ipacm/inc/IPACM_Xml.h @@ -45,6 +45,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <stdio.h> #include <stdlib.h> #include <string.h> +#ifndef in_addr_t +typedef uint32_t in_addr_t; +#endif #include <arpa/inet.h> #include <stdint.h> #include <libxml/parser.h> diff --git a/ipacm/src/IPACM_ConntrackClient.cpp b/ipacm/src/IPACM_ConntrackClient.cpp index 29afd50..a953626 100644 --- a/ipacm/src/IPACM_ConntrackClient.cpp +++ b/ipacm/src/IPACM_ConntrackClient.cpp @@ -31,6 +31,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <stdlib.h> #include <string.h> #include <errno.h> +#ifndef in_addr_t +typedef uint32_t in_addr_t; +#endif #include <arpa/inet.h> #include <netinet/in.h> #include <sys/ioctl.h> diff --git a/ipacm/src/IPACM_Xml.cpp b/ipacm/src/IPACM_Xml.cpp index d59bbb0..9c4af41 100644 --- a/ipacm/src/IPACM_Xml.cpp +++ b/ipacm/src/IPACM_Xml.cpp @@ -39,6 +39,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <sys/socket.h> #include <netinet/in.h> +#ifndef in_addr_t +typedef uint32_t in_addr_t; +#endif #include <arpa/inet.h> #include "IPACM_Xml.h" |