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