From: Isaac Dunham <idunham@lavabit.com>
To: musl@lists.openwall.com
Subject: Re: getopt* and iptables
Date: Mon, 24 Sep 2012 09:23:23 -0700 [thread overview]
Message-ID: <20120924092323.b9b6ec7e.idunham@lavabit.com> (raw)
In-Reply-To: <20120924221609.4d623d05@sibserver.ru>
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>
next prev parent reply other threads:[~2012-09-24 16:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-23 17:31 orc
2012-09-23 18:11 ` John Spencer
2012-09-24 14:16 ` orc
2012-09-24 16:23 ` Isaac Dunham [this message]
2012-09-24 16:58 ` orc
2012-09-24 18:20 ` John Spencer
2012-09-24 18:46 ` orc
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=20120924092323.b9b6ec7e.idunham@lavabit.com \
--to=idunham@lavabit.com \
--cc=musl@lists.openwall.com \
/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.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
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).