Merge branch '21_empty_strlcpy'

This commit is contained in:
Nick Mathewson 2013-04-01 11:59:26 -04:00
commit 3339800854
2 changed files with 4 additions and 1 deletions

View File

@ -156,6 +156,9 @@ SYS_INCLUDES =
endif endif
if STRLCPY_IMPL
SYS_SRC += strlcpy.c
endif
if SELECT_BACKEND if SELECT_BACKEND
SYS_SRC += select.c SYS_SRC += select.c
endif endif
@ -200,7 +203,6 @@ CORE_SRC = \
evutil_time.c \ evutil_time.c \
listener.c \ listener.c \
log.c \ log.c \
strlcpy.c \
$(SYS_SRC) $(SYS_SRC)
EXTRAS_SRC = \ EXTRAS_SRC = \

View File

@ -362,6 +362,7 @@ AC_CHECK_FUNCS([ \
usleep \ usleep \
vasprintf \ vasprintf \
]) ])
AM_CONDITIONAL(STRLCPY_IMPL, [test x"$ac_cv_func_strlcpy" = xno])
AC_CACHE_CHECK( AC_CACHE_CHECK(
[for getaddrinfo], [for getaddrinfo],