diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-07 14:12:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-12-07 14:12:17 -0500 |
| commit | 3fa9151f2610fdad23df02b2b914881286b22480 (patch) | |
| tree | ef9f91dfb3c886a59cc591739dc7ddb6f8a703a5 /configure.ac | |
| parent | cd4f56a37c3513cdca3463c3638067380af29219 (diff) | |
| parent | 4458fd0cd8fa259f0ee8195e1aa86d5b7c6f8919 (diff) | |
| download | tor-3fa9151f2610fdad23df02b2b914881286b22480.tar tor-3fa9151f2610fdad23df02b2b914881286b22480.tar.gz | |
Merge branch 'win64-7260'
Conflicts:
src/or/dns.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 9963a97d4..9ddbbe2c6 100644 --- a/configure.ac +++ b/configure.ac @@ -318,6 +318,7 @@ AC_CHECK_FUNCS( sysconf \ uname \ vasprintf \ + _vscprintf ) if test "$enable_threads" = "yes"; then @@ -784,6 +785,7 @@ AC_CHECK_SIZEOF(__int64) AC_CHECK_SIZEOF(void *) AC_CHECK_SIZEOF(time_t) AC_CHECK_SIZEOF(size_t) +AC_CHECK_SIZEOF(pid_t) AC_CHECK_TYPES([uint, u_char, ssize_t]) |