Openwall GNU/*/Linux - a small security-enhanced Linux distro for servers
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Mon, 24 Sep 2012 09:23:23 -0700
From: Isaac Dunham <idunham@...abit.com>
To: musl@...ts.openwall.com
Subject: Re: getopt* and iptables

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@...abit.com>

Powered by blists - more mailing lists

Your e-mail address:

Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.