commit 7f45ea5c41bd076accd3720c021e6d3b512fb2b2 Merge: b4bd496 f35271b Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 5 10:31:00 2012 -0400

Merge remote-tracking branch 'public/bug3894'

changes/bug3894_more | 4 ++++ configure.in | 2 ++ src/common/compat.h | 3 +++ src/common/torint.h | 10 ++++++++++ src/common/util.c | 2 +- 5 files changed, 20 insertions(+), 1 deletions(-)

diff --cc configure.in index 0f31071,df4c6f6..56cf3d6 --- a/configure.in +++ b/configure.in @@@ -645,41 -415,10 +645,43 @@@ AC_CHECK_HEADERS

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 linux/types.h sys/file.h malloc_np.h sys/prctl.h) +AC_CHECK_HEADERS( + arpa/inet.h \ + crt_externs.h \ + grp.h \ + ifaddrs.h \ + inttypes.h \ + limits.h \ + linux/types.h \ + machine/limits.h \ + malloc.h \ + malloc/malloc.h \ + malloc_np.h \ + netdb.h \ + netinet/in.h \ + netinet/in6.h \ + pwd.h \ + stdint.h \ + sys/file.h \ + sys/ioctl.h \ + sys/limits.h \ + sys/mman.h \ + sys/param.h \ + sys/prctl.h \ + sys/resource.h \ + sys/socket.h \ + sys/syslimits.h \ + sys/time.h \ + sys/types.h \ + sys/un.h \ + sys/utime.h \ + sys/wait.h \ + syslog.h \ + utime.h +)

+ AC_CHECK_HEADERS(sys/param.h) + TOR_CHECK_PROTOTYPE(malloc_good_size, HAVE_MALLOC_GOOD_SIZE_PROTOTYPE, [#ifdef HAVE_MALLOC_H #include <malloc.h>