diff options
| author | Narayan Kamath <narayan@google.com> | 2017-09-13 12:53:52 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2017-09-13 14:18:03 +0100 |
| commit | fc74cb45eafe51162b10a850016c6d2e1f8fd23c (patch) | |
| tree | 203fb0f2feed47099e5bf999bcaff954f5c0e49d /strlcpy.c | |
| parent | 9dfd4017adef7eaf179f743bf746254917a4fb74 (diff) | |
| download | libevent-fc74cb45eafe51162b10a850016c6d2e1f8fd23c.tar.gz | |
Revert "Revert "Upgrade to 2.1.8-stable (2017-01-22)." and "Probably Mac build fix?""
This reverts commit 83a0c9c65a60a92d3ea5542596b3ba56db492c37.
Bug: 64543673
Test: make checkbuild
Test: Manual tombstoned test
Change-Id: I84bb128d1dec433195f2cbdbf70236ba17fa9955
Diffstat (limited to 'strlcpy.c')
| -rw-r--r-- | strlcpy.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -31,11 +31,12 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/types.h> - #include "event2/event-config.h" +#include "evconfig-private.h" + +#include <sys/types.h> -#ifndef _EVENT_HAVE_STRLCPY +#ifndef EVENT__HAVE_STRLCPY #include "strlcpy-internal.h" /* @@ -44,7 +45,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp * Returns strlen(src); if retval >= siz, truncation occurred. */ size_t -_event_strlcpy(dst, src, siz) +event_strlcpy_(dst, src, siz) char *dst; const char *src; size_t siz; |