Backport: On recent linux kernels we were not detecting the linux/netfilter_ipv4.h header properly, since we needed to have in_addr and in6_addr and __u32 defined before trying to include it. Fix that.
svn:r16461
This commit is contained in:
parent
9250b0bd62
commit
355d84d122
|
@ -4,6 +4,8 @@ Changes in version 0.2.0.31 - 2008-08-??
|
|||
by rovv.
|
||||
- Recover 3-7 bytes that were wasted per memory chunk. Fixes bug
|
||||
794; bug spotted by rovv. Bugfix on 0.2.0.1-alpha.
|
||||
- Correctly detect the presence of the linux/netfilter_ipv4.h header
|
||||
when building against recent kernels. Bugfix on 0.1.2.1-alpha.
|
||||
|
||||
|
||||
Changes in version 0.2.0.30 - 2008-07-15
|
||||
|
|
11
configure.in
11
configure.in
|
@ -301,7 +301,7 @@ AC_CHECK_HEADERS(netdb.h sys/ioctl.h sys/socket.h arpa/inet.h netinet/in.h pwd.h
|
|||
|
||||
dnl These headers are not essential
|
||||
|
||||
AC_CHECK_HEADERS(stdint.h sys/types.h inttypes.h sys/param.h sys/wait.h limits.h sys/limits.h netinet/in.h arpa/inet.h machine/limits.h syslog.h sys/time.h sys/resource.h inttypes.h utime.h sys/utime.h sys/mman.h netinet/in6.h malloc.h sys/syslimits.h malloc/malloc.h)
|
||||
AC_CHECK_HEADERS(stdint.h sys/types.h inttypes.h sys/param.h sys/wait.h limits.h sys/limits.h netinet/in.h arpa/inet.h machine/limits.h syslog.h sys/time.h sys/resource.h inttypes.h utime.h sys/utime.h sys/mman.h netinet/in6.h malloc.h sys/syslimits.h malloc/malloc.h linux/types.h)
|
||||
|
||||
TOR_CHECK_PROTOTYPE(malloc_good_size, HAVE_MALLOC_GOOD_SIZE_PROTOTYPE,
|
||||
[#ifdef HAVE_MALLOC_H
|
||||
|
@ -336,6 +336,15 @@ AC_CHECK_HEADERS(linux/netfilter_ipv4.h,
|
|||
#ifdef HAVE_SYS_SOCKET_H
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
#ifdef HAVE_LIMITS_H
|
||||
#include <limits.h>
|
||||
#endif
|
||||
#ifdef HAVE_LINUX_TYPES_H
|
||||
#include <linux/types.h>
|
||||
#endif
|
||||
#ifdef HAVE_NETINET_IN6_H
|
||||
#include <netinet/in6.h>
|
||||
#endif
|
||||
#ifdef HAVE_NETINET_IN_H
|
||||
#include <netinet/in.h>
|
||||
#endif])
|
||||
|
|
|
@ -14,6 +14,9 @@ const char connection_edge_c_id[] =
|
|||
|
||||
#include "or.h"
|
||||
|
||||
#ifdef HAVE_LINUX_TYPES_H
|
||||
#include <linux/types.h>
|
||||
#endif
|
||||
#ifdef HAVE_LINUX_NETFILTER_IPV4_H
|
||||
#include <linux/netfilter_ipv4.h>
|
||||
#define TRANS_NETFILTER
|
||||
|
|
Loading…
Reference in New Issue