|
 |
0890d3 |
From 938f4d10663d99dff32ce92c7a2ce1af6de47aa2 Mon Sep 17 00:00:00 2001
|
|
|
0890d3 |
From: Felix Janda <felix.janda@posteo.de>
|
|
|
0890d3 |
Date: Sat, 16 May 2015 10:31:41 +0200
|
|
|
0890d3 |
Subject: [PATCH] src: Remove support for libc5
|
|
|
0890d3 |
|
|
|
0890d3 |
Fixes compilation with musl libc
|
|
|
0890d3 |
|
|
|
0890d3 |
Signed-off-by: Felix Janda <felix.janda@posteo.de>
|
|
|
0890d3 |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
0890d3 |
(cherry picked from commit f4ab8f63f11a72f14687a6646d04ae1bae3fa45f)
|
|
|
0890d3 |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
0890d3 |
---
|
|
|
0890d3 |
include/libarptc/arpt_kernel_headers.h | 12 ------------
|
|
|
0890d3 |
libarptc/libarptc.c | 4 ----
|
|
|
0890d3 |
2 files changed, 16 deletions(-)
|
|
|
0890d3 |
|
|
|
0890d3 |
diff --git a/include/libarptc/arpt_kernel_headers.h b/include/libarptc/arpt_kernel_headers.h
|
|
|
0890d3 |
index 442cc54cd3962..140e99973ad15 100644
|
|
|
0890d3 |
--- a/include/libarptc/arpt_kernel_headers.h
|
|
|
0890d3 |
+++ b/include/libarptc/arpt_kernel_headers.h
|
|
|
0890d3 |
@@ -5,7 +5,6 @@
|
|
|
0890d3 |
|
|
|
0890d3 |
#include <limits.h>
|
|
|
0890d3 |
|
|
|
0890d3 |
-#if defined(__GLIBC__) && __GLIBC__ == 2
|
|
|
0890d3 |
#include <netinet/ip.h>
|
|
|
0890d3 |
#include <netinet/in.h>
|
|
|
0890d3 |
#include <netinet/ip_icmp.h>
|
|
|
0890d3 |
@@ -14,16 +13,5 @@
|
|
|
0890d3 |
#include <netinet/ether.h>
|
|
|
0890d3 |
#include <net/if.h>
|
|
|
0890d3 |
#include <sys/types.h>
|
|
|
0890d3 |
-#else
|
|
|
0890d3 |
-#include <sys/socket.h>
|
|
|
0890d3 |
-#include <linux/ip.h>
|
|
|
0890d3 |
-#include <linux/in.h>
|
|
|
0890d3 |
-#include <linux/if.h>
|
|
|
0890d3 |
-#include <linux/icmp.h>
|
|
|
0890d3 |
-#include <linux/tcp.h>
|
|
|
0890d3 |
-#include <linux/udp.h>
|
|
|
0890d3 |
-#include <linux/types.h>
|
|
|
0890d3 |
-#include <linux/in6.h>
|
|
|
0890d3 |
-#endif
|
|
|
0890d3 |
|
|
|
0890d3 |
#endif
|
|
|
0890d3 |
diff --git a/libarptc/libarptc.c b/libarptc/libarptc.c
|
|
|
0890d3 |
index 6d9773553e679..e979dad6cebbe 100644
|
|
|
0890d3 |
--- a/libarptc/libarptc.c
|
|
|
0890d3 |
+++ b/libarptc/libarptc.c
|
|
|
0890d3 |
@@ -23,10 +23,6 @@
|
|
|
0890d3 |
#define inline
|
|
|
0890d3 |
#endif
|
|
|
0890d3 |
|
|
|
0890d3 |
-#if !defined(__GLIBC__) || (__GLIBC__ < 2)
|
|
|
0890d3 |
-typedef unsigned int socklen_t;
|
|
|
0890d3 |
-#endif
|
|
|
0890d3 |
-
|
|
|
0890d3 |
#include "libarptc/libarptc.h"
|
|
|
0890d3 |
|
|
|
0890d3 |
#define IP_VERSION 4
|
|
|
0890d3 |
--
|
|
|
0890d3 |
2.21.0
|
|
|
0890d3 |
|