From: Dave Hart <hart@ntp.org>
Date: Thu, 14 Jun 2012 23:17:32 +0000 (+0000)
Subject: repair merge flub
X-Git-Tag: NTP_4_2_7P284~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ef899607752867785c456e46d94a4eb144f4552;p=thirdparty%2Fntp.git

repair merge flub
keep local-to-NTP patch up to date with event-config.h s/_EVENT/EVENT_/

bk: 4fda710cZvYSSiGeZa-X5nTkPdXXSQ
---

diff --git a/sntp/libevent/configure.in b/sntp/libevent/configure.in
index 5ec48918f..46c884704 100644
--- a/sntp/libevent/configure.in
+++ b/sntp/libevent/configure.in
@@ -408,6 +408,9 @@ AC_CHECK_FUNCS([getservbyname])
 # Check for gethostbyname_r in all its glorious incompatible versions.
 #   (This is cut-and-pasted from Tor, which based its logic on
 #   Python's configure.in.)
+AH_TEMPLATE(HAVE_GETHOSTBYNAME_R,
+  [Define this if you have any gethostbyname_r()])
+
 AC_CHECK_FUNC(gethostbyname_r, [
   AC_MSG_CHECKING([how many arguments gethostbyname_r() wants])
   OLD_CFLAGS=$CFLAGS
diff --git a/sntp/libevent/evthread_pthread.c b/sntp/libevent/evthread_pthread.c
index 202c69157..6f2064ae0 100644
--- a/sntp/libevent/evthread_pthread.c
+++ b/sntp/libevent/evthread_pthread.c
@@ -39,7 +39,7 @@ struct event_base;
 #include "mm-internal.h"
 #include "evthread-internal.h"
 
-#if _EVENT_HAVE_PTHREADS < 5		/* HP-UX 10.20 has 4, needs this */
+#if EVENT__HAVE_PTHREADS < 5		/* HP-UX 10.20 has 4, needs this */
 # define pthread_mutex_init(m, a)					\
 	 pthread_mutex_init(m, (a)					\
 				? *(const pthread_mutexattr_t *)(a)	\