Mercurial > luaevent-prosody / changeset
changeset
Merge branch 'prosody-tree'
Sat, 15 Jan 2011 19:51:21 -0500
- author
- Thomas Harning Jr <harningt@gmail.com>
- date
- Sat, 15 Jan 2011 19:51:21 -0500
- changeset 93
- f0f5046ba1b0
- parent 92
- 57662d96d8a8 (diff)
- parent 86
- 72cd8cb9b184 (current diff)
- child 94
- 59d924f63c4a
Merge branch 'prosody-tree'
| premake.lua | file | annotate | diff | comparison | revisions | |
| src/buffer_event.c | file | annotate | diff | comparison | revisions |
--- 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; }
