From mboxrd@z Thu Jan  1 00:00:00 1970
X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/1993
Path: news.gmane.org!not-for-mail
From: Isaac Dunham <idunham@lavabit.com>
Newsgroups: gmane.linux.lib.musl.general
Subject: Re: getopt* and iptables
Date: Mon, 24 Sep 2012 09:23:23 -0700
Message-ID: <20120924092323.b9b6ec7e.idunham@lavabit.com>
References: <20120924013117.3ba68fd0@sibserver.ru>
	<505F50E4.9010901@barfooze.de>
	<20120924221609.4d623d05@sibserver.ru>
Reply-To: musl@lists.openwall.com
NNTP-Posting-Host: plane.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Trace: ger.gmane.org 1348503820 29341 80.91.229.3 (24 Sep 2012 16:23:40 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Mon, 24 Sep 2012 16:23:40 +0000 (UTC)
To: musl@lists.openwall.com
Original-X-From: musl-return-1994-gllmg-musl=m.gmane.org@lists.openwall.com Mon Sep 24 18:23:46 2012
Return-path: <musl-return-1994-gllmg-musl=m.gmane.org@lists.openwall.com>
Envelope-to: gllmg-musl@plane.gmane.org
Original-Received: from mother.openwall.net ([195.42.179.200])
	by plane.gmane.org with smtp (Exim 4.69)
	(envelope-from <musl-return-1994-gllmg-musl=m.gmane.org@lists.openwall.com>)
	id 1TGBRe-0008Jg-Ts
	for gllmg-musl@plane.gmane.org; Mon, 24 Sep 2012 18:23:43 +0200
Original-Received: (qmail 10139 invoked by uid 550); 24 Sep 2012 16:23:37 -0000
Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm
Precedence: bulk
List-Post: <mailto:musl@lists.openwall.com>
List-Help: <mailto:musl-help@lists.openwall.com>
List-Unsubscribe: <mailto:musl-unsubscribe@lists.openwall.com>
List-Subscribe: <mailto:musl-subscribe@lists.openwall.com>
Original-Received: (qmail 10128 invoked from network); 24 Sep 2012 16:23:36 -0000
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=lavabit; d=lavabit.com;
  b=n7SDuHpvZUa+FT0aJMJrWIqRssUc7HcTm57KuS6CaZblHY4A6RdXhMVuDaByr7u0/0ZnC1SRHSIBfMgcfu/MoUCBLVmdc+FQfD5ckJGlWjIoCLuKlHBs/cmgm+rb32byXlMW3xPEwt4+DMHukBPnRodw+fZ3S2yDe+ZOz/k+O8s=;
  h=Date:From:To:Subject:Message-Id:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type:Content-Transfer-Encoding;
In-Reply-To: <20120924221609.4d623d05@sibserver.ru>
X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu)
Xref: news.gmane.org gmane.linux.lib.musl.general:1993
Archived-At: <http://permalink.gmane.org/gmane.linux.lib.musl.general/1993>

If upstream wants to support libc5, this patch would be rejected. Additionally, there's a better/simpler way to do it:
-#if defined(__GLIBC__) && __GLIBC__ == 2
+#if __GNU_LIBRARY__ >= 6 || !defined(__GNU_LIBRARY__)
/*__GNU_LIBRARY__ is what libc[1-5] used */


> --- iptables-1.4.12.1.o/include/libiptc/ipt_kernel_headers.h
> +++ iptables-1.4.12.1/include/libiptc/ipt_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>
> @@ -13,15 +12,4 @@
>  #include <netinet/udp.h>
>  #include <net/if.h>
>  #include <sys/types.h>
> -#else /* libc5 */
> -#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

-- 
Isaac Dunham <idunham@lavabit.com>