From b55dd2442a2f6b90461edcea9344567ba7fc7832 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 5 Oct 2016 08:59:56 +0900 Subject: [PATCH] libevent2022: rename _event_strlcpy --- opal/mca/event/libevent2022/libevent/opal_rename.h | 5 ++++- opal/mca/event/libevent2022/libevent/strlcpy-internal.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/opal/mca/event/libevent2022/libevent/opal_rename.h b/opal/mca/event/libevent2022/libevent/opal_rename.h index 9a104d091e..8a3af9ed5f 100644 --- a/opal/mca/event/libevent2022/libevent/opal_rename.h +++ b/opal/mca/event/libevent2022/libevent/opal_rename.h @@ -3,8 +3,10 @@ * Copyright (c) 2004-2006 The Regents of the University of California. * All rights reserved. * Copyright (c) 2008-2011 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2012 UT-Battelle, LLC. All rights reserved. + * Copyright (c) 2012 UT-Battelle, LLC. All rights reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * * $COPYRIGHT$ * @@ -302,6 +304,7 @@ extern "C" { #define event_set_mem_functions opal_libevent2022_event_set_mem_functions #define event_sock_err opal_libevent2022_event_sock_err #define event_sock_warn opal_libevent2022_event_sock_warn +#define _event_strlcpy opal_libevent2022__event_strlcpy #define event_warn opal_libevent2022_event_warn #define event_warnx opal_libevent2022_event_warnx #define evhttp_accept_socket opal_libevent2022_evhttp_accept_socket diff --git a/opal/mca/event/libevent2022/libevent/strlcpy-internal.h b/opal/mca/event/libevent2022/libevent/strlcpy-internal.h index 1968c00312..672ea7268d 100644 --- a/opal/mca/event/libevent2022/libevent/strlcpy-internal.h +++ b/opal/mca/event/libevent2022/libevent/strlcpy-internal.h @@ -6,6 +6,7 @@ extern "C" { #endif #include "event2/event-config.h" +#include "event2/util.h" #ifndef _EVENT_HAVE_STRLCPY #include