# HG changeset patch
# User Thomas Harning Jr <harningt@gmail.com>
# Date 1295141535 18000
# Node ID dc3809bf780ab0e02df9d8698daa183d0455abd0
# Parent  41a6f9a64b9e50b497c15ec3366061152e797f27# Parent  f5369fe8f1078c210e410ede4df7b1dff54d5cdf
Merge remote branch 'jsnyder-tree/master'

Conflicts:
	CHANGELOG
	Makefile
	README

diff -r 41a6f9a64b9e -r dc3809bf780a CHANGELOG
--- a/CHANGELOG	Sat Jan 15 20:21:54 2011 -0500
+++ b/CHANGELOG	Sat Jan 15 20:32:15 2011 -0500
@@ -4,6 +4,9 @@
  * Removes low-level read access to watermark & timeout values that break API
  * Switches to watermark write accessor function to avoid API break
 ======
+luaevent-prosody 0.1.1 - 2010-02-25
+ * Fix overflow with high event timeouts
+======
 luaevent-prosody 0.1.0 - 2010-02-15
  * Fixed stack slot leak in event callbacks
  * Fixed stack slot leak when error occurs in callback
diff -r 41a6f9a64b9e -r dc3809bf780a Makefile
--- a/Makefile	Sat Jan 15 20:21:54 2011 -0500
+++ b/Makefile	Sat Jan 15 20:32:15 2011 -0500
@@ -23,8 +23,10 @@
 	$(CC) $(LDFLAGS) -o $(LIB) *.o -L$(LUA_LIB_DIR) -l$(LUA_LIB) -levent
 
 install: all
-	$(INSTALL_DATA) -D lua/luaevent.lua $(DESTDIR)$(INSTALL_DIR_LUA)/luaevent.lua
-	$(INSTALL_PROGRAM) -D $(LIB) $(DESTDIR)$(INSTALL_DIR_BIN)/luaevent/$(LIB)
+	mkdir -p $(DESTDIR)$(INSTALL_DIR_LUA)
+	$(INSTALL_DATA) lua/luaevent.lua $(DESTDIR)$(INSTALL_DIR_LUA)/luaevent.lua
+	mkdir -p $(DESTDIR)$(INSTALL_DIR_BIN)/luaevent/
+	$(INSTALL_PROGRAM) $(LIB) $(DESTDIR)$(INSTALL_DIR_BIN)/luaevent/$(LIB)
 
 clean:
 	rm -f *.so
diff -r 41a6f9a64b9e -r dc3809bf780a README
diff -r 41a6f9a64b9e -r dc3809bf780a src/buffer_event.c
--- a/src/buffer_event.c	Sat Jan 15 20:21:54 2011 -0500
+++ b/src/buffer_event.c	Sat Jan 15 20:32:15 2011 -0500
@@ -1,9 +1,9 @@
 /* LuaEvent - Copyright (C) 2007 Thomas Harning <harningt@gmail.com>
  * Licensed as LGPL - See doc/COPYING for details */
+#include <stdlib.h>
 #include "buffer_event.h"
 #include "utility.h"
 #include <lauxlib.h>
-#include <malloc.h>
 #include "event_buffer.h"
 
 #define BUFFER_EVENT_MT "BUFFER_EVENT_MT"
diff -r 41a6f9a64b9e -r dc3809bf780a src/event_buffer.c
--- a/src/event_buffer.c	Sat Jan 15 20:21:54 2011 -0500
+++ b/src/event_buffer.c	Sat Jan 15 20:32:15 2011 -0500
@@ -1,9 +1,8 @@
 /* LuaEvent - Copyright (C) 2007 Thomas Harning <harningt@gmail.com>
  * Licensed as LGPL - See doc/COPYING for details */
-
+#include <stdlib.h>
 #include "event_buffer.h"
 #include <lauxlib.h>
-#include <malloc.h>
 
 #define EVENT_BUFFER_MT "EVENT_BUFFER_MT"
 
diff -r 41a6f9a64b9e -r dc3809bf780a src/luaevent.c
--- a/src/luaevent.c	Sat Jan 15 20:21:54 2011 -0500
+++ b/src/luaevent.c	Sat Jan 15 20:32:15 2011 -0500
@@ -56,8 +56,8 @@
 }
 
 void load_timeval(double time, struct timeval *tv) {
-	tv->tv_sec = (int)time;
-	tv->tv_usec = (int)(time * 1000000) % 1000000;
+	tv->tv_sec = (int) time;
+	tv->tv_usec = (int)( (time - tv->tv_sec) * 1000000 );
 }
 
 /* sock, event, callback, timeout */