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 5ec48918f48162d1791cb67a07f0ef427e953cc1..46c884704a5b1dcdd84429557d7c2be27340b64a 100644 (file)
--- 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 202c691574e0fa9e628b22e4265ebfe1e3de6827..6f2064ae00457ecb983e770cada31a3eecfb4d0e 100644 (file)
--- 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)     \