bring up to date with nbd's br2_test20.tar.bz2
[openwrt.git] / package / dnsmasq / dnsmasq2-100-config.patch
1 diff -ur dnsmasq-2.15.orig/src/config.h dnsmasq-2.15/src/config.h
2 --- dnsmasq-2.15.orig/src/config.h 2004-10-08 11:41:34.757371880 -0400
3 +++ dnsmasq-2.15/src/config.h 2004-10-08 11:43:49.074952504 -0400
4 @@ -78,6 +78,11 @@
5 /* We assume that systems which don't have IPv6
6 headers don't have ntop and pton either */
7
8 +#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)
9 +# undef NO_IPV6
10 +# define NO_IPV6
11 +#endif
12 +
13 #if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6)
14 # define HAVE_IPV6
15 # define ADDRSTRLEN INET6_ADDRSTRLEN
16 @@ -194,7 +199,7 @@
17 /* platform dependent options. */
18
19 /* Must preceed __linux__ since uClinux defines __linux__ too. */
20 -#if defined(__uClinux__) || defined(__UCLIBC__)
21 +#if defined(__uClinux__)
22 #undef HAVE_LINUX_IPV6_PROC
23 #define HAVE_GETOPT_LONG
24 #undef HAVE_ARC4RANDOM
25 @@ -208,6 +213,24 @@
26 # define NO_FORK
27 #endif
28
29 +#elif defined(__linux__) && defined(__UCLIBC__)
30 +# define HAVE_LINUX_IPV6_PROC
31 +# if defined(__UCLIBC_HAS_GNU_GETOPT__) || \
32 + ((__UCLIBC_MAJOR__==0) && (__UCLIBC_MINOR__==9) && (__UCLIBC_SUBLEVEL__<21))
33 +# define HAVE_GETOPT_LONG
34 +# else
35 +# undef HAVE_GETOPT_LONG
36 +# endif
37 +#undef HAVE_ARC4RANDOM
38 +#define HAVE_RANDOM
39 +#define HAVE_DEV_URANDOM
40 +#define HAVE_DEV_RANDOM
41 +#undef HAVE_SOCKADDR_SA_LEN
42 +#undef HAVE_PSELECT
43 +#if !defined(__ARCH_HAS_MMU__)
44 +# define NO_FORK
45 +#endif
46 +
47 /* libc5 - must precede __linux__ too */
48 /* Note to build a libc5 binary on a modern Debian system:
49 install the packages altgcc libc5 and libc5-altdev
This page took 0.067789 seconds and 5 git commands to generate.