From dba1bc96f6f4fbbb48ab7b041964d44242731b17 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Sun, 5 Dec 2004 22:41:16 +0000 Subject: [PATCH] 1782. [port] OSX: --with-libtool + --enable-libbind broke on __evOptMonoTime. [RT #13219] --- CHANGES | 3 ++- lib/bind/isc/eventlib.c | 4 +++- lib/bind/isc/eventlib_p.h | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index bb2412b0ac..f9a245ce82 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,8 @@ 1783. [cleanup] We only need one copy of libtool.m4, ltmain.sh in the source tree. -1782. [placeholder] rt13219 +1782. [port] OSX: --with-libtool + --enable-libbind broke on + __evOptMonoTime. [RT #13219] 1781. [port] FreeBSD 5.3: set PTHREAD_SCOPE_SYSTEM. [RT #12810] diff --git a/lib/bind/isc/eventlib.c b/lib/bind/isc/eventlib.c index 6a6ae959d8..388f030bd1 100644 --- a/lib/bind/isc/eventlib.c +++ b/lib/bind/isc/eventlib.c @@ -20,7 +20,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: eventlib.c,v 1.5 2004/03/18 02:58:00 marka Exp $"; +static const char rcsid[] = "$Id: eventlib.c,v 1.6 2004/12/05 22:41:16 marka Exp $"; #endif #include "port_before.h" @@ -42,6 +42,8 @@ static const char rcsid[] = "$Id: eventlib.c,v 1.5 2004/03/18 02:58:00 marka Exp #include "port_after.h" +int __evOptMonoTime; + /* Forward. */ #ifdef NEED_PSELECT diff --git a/lib/bind/isc/eventlib_p.h b/lib/bind/isc/eventlib_p.h index 649582c403..f56cb5ada1 100644 --- a/lib/bind/isc/eventlib_p.h +++ b/lib/bind/isc/eventlib_p.h @@ -18,7 +18,7 @@ /* eventlib_p.h - private interfaces for eventlib * vix 09sep95 [initial] * - * $Id: eventlib_p.h,v 1.5 2004/03/09 06:30:08 marka Exp $ + * $Id: eventlib_p.h,v 1.6 2004/12/05 22:41:16 marka Exp $ */ #ifndef _EVENTLIB_P_H @@ -214,6 +214,6 @@ void evDestroyTimers(const evContext_p *); evWait *evFreeWait(evContext_p *ctx, evWait *old); /* Global options */ -int __evOptMonoTime; +extern int __evOptMonoTime; #endif /*_EVENTLIB_P_H*/