commit 0ba2d3bbb829cc71e38ecae6d5d9134af9045a22 Merge: 5f4b127 a195187 Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 10 14:49:01 2012 -0500

Merge branch 'bug5078'

configure.ac | 15 +++++++++++++++ src/managed.c | 11 +++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-)

diff --cc configure.ac index 5234911,4105990..cb65863 --- a/configure.ac +++ b/configure.ac @@@ -43,8 -49,22 +43,23 @@@ LIBS="$save_LIBS

AC_C_INLINE AC_CHECK_SIZEOF(int) +AC_CHECK_SIZEOF(size_t)

+ dnl check for working va_copy. It could be a function or a macro. + AC_MSG_CHECKING([whether we have va_copy]) + AC_CACHE_VAL(obfs_cv_have_vacopy, + AC_TRY_LINK([#include <stdarg.h>], [ + va_list ap, ap2; + va_copy(ap, ap2); + ], [obfs_cv_have_vacopy=true], + [obfs_cv_have_vacopy=false])) + if test "$obfs_cv_have_vacopy" = true; then + AC_DEFINE(HAVE_VA_COPY, 1, [True if this platform has the standard va_copy macro]) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + ### Output ###

AC_CONFIG_FILES([Makefile])