# HG changeset patch
# User Thomas Harning Jr <harningt@gmail.com>
# Date 1295139081 18000
# Node ID f0f5046ba1b0391bcd3a226d01a2ff3020da665b
# Parent  57662d96d8a8374d27b4153bb8d077fbdb9e7088# Parent  72cd8cb9b184716a2a8e82de92c25f5f9807bf5f
Merge branch 'prosody-tree'

diff -r 72cd8cb9b184 -r f0f5046ba1b0 src/buffer_event.c
--- a/src/buffer_event.c	Mon Feb 15 14:30:27 2010 +0000
+++ b/src/buffer_event.c	Sat Jan 15 19:51:21 2011 -0500
@@ -205,8 +205,13 @@
 	le_bufferevent* ev = buffer_event_get(L, 1);
 	if(!ev->ev) return 0;
 
+#if LIBEVENT_VERSION_NUMBER >= 0x02000000
+	lua_pushinteger(L, (ev->ev->timeout_read).tv_sec);
+	lua_pushinteger(L, (ev->ev->timeout_write).tv_sec);
+#else
 	lua_pushinteger(L, ev->ev->timeout_read);
 	lua_pushinteger(L, ev->ev->timeout_write);
+#endif
 	return 2;
 }