Blob Blame History Raw
From 938f4d10663d99dff32ce92c7a2ce1af6de47aa2 Mon Sep 17 00:00:00 2001
From: Felix Janda <felix.janda@posteo.de>
Date: Sat, 16 May 2015 10:31:41 +0200
Subject: [PATCH] src: Remove support for libc5

Fixes compilation with musl libc

Signed-off-by: Felix Janda <felix.janda@posteo.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
(cherry picked from commit f4ab8f63f11a72f14687a6646d04ae1bae3fa45f)
Signed-off-by: Phil Sutter <psutter@redhat.com>
---
 include/libarptc/arpt_kernel_headers.h | 12 ------------
 libarptc/libarptc.c                    |  4 ----
 2 files changed, 16 deletions(-)

diff --git a/include/libarptc/arpt_kernel_headers.h b/include/libarptc/arpt_kernel_headers.h
index 442cc54cd3962..140e99973ad15 100644
--- a/include/libarptc/arpt_kernel_headers.h
+++ b/include/libarptc/arpt_kernel_headers.h
@@ -5,7 +5,6 @@
 
 #include <limits.h>
 
-#if defined(__GLIBC__) && __GLIBC__ == 2
 #include <netinet/ip.h>
 #include <netinet/in.h>
 #include <netinet/ip_icmp.h>
@@ -14,16 +13,5 @@
 #include <netinet/ether.h>
 #include <net/if.h>
 #include <sys/types.h>
-#else
-#include <sys/socket.h>
-#include <linux/ip.h>
-#include <linux/in.h>
-#include <linux/if.h>
-#include <linux/icmp.h>
-#include <linux/tcp.h>
-#include <linux/udp.h>
-#include <linux/types.h>
-#include <linux/in6.h>
-#endif
 
 #endif
diff --git a/libarptc/libarptc.c b/libarptc/libarptc.c
index 6d9773553e679..e979dad6cebbe 100644
--- a/libarptc/libarptc.c
+++ b/libarptc/libarptc.c
@@ -23,10 +23,6 @@
 #define inline
 #endif
 
-#if !defined(__GLIBC__) || (__GLIBC__ < 2)
-typedef unsigned int socklen_t;
-#endif
-
 #include "libarptc/libarptc.h"
 
 #define IP_VERSION	4
-- 
2.21.0