netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Felix Janda <felix.janda@posteo.de>
To: netfilter-devel@vger.kernel.org
Subject: [arptables PATCH 2/2] Remove support for libc5
Date: Sat, 16 May 2015 10:31:41 +0200	[thread overview]
Message-ID: <20150516083141.GB14201@euler> (raw)

Fixes compilation with musl libc

Signed-off-by: Felix Janda <felix.janda@posteo.de>
---
 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 442cc54..140e999 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 f03dd0b..71602c2 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.3.6

                 reply	other threads:[~2015-05-16  8:31 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150516083141.GB14201@euler \
    --to=felix.janda@posteo.de \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).