# HG changeset patch
# User Thomas Harning Jr <harningt@gmail.com>
# Date 1247668750 14400
# Node ID dd47dbe85becb65878ecfc3a92c09adda0eab811
# Parent  ed98dcbaacb0134896e86a1c561fac9069740415# Parent  1b8cbf640378172ed6c9650fefb6bc84099254f3
Merge branch 'v0.2'

diff -r ed98dcbaacb0 -r dd47dbe85bec src/luaevent.c
--- a/src/luaevent.c	Sun Nov 25 18:46:04 2007 -0500
+++ b/src/luaevent.c	Wed Jul 15 10:39:10 2009 -0400
@@ -12,6 +12,10 @@
 
 #define EVENT_BASE_MT "EVENT_BASE_MT"
 
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
+
 le_base* event_base_get(lua_State* L, int idx) {
 	return (le_base*)luaL_checkudata(L, idx, EVENT_BASE_MT);
 }
@@ -127,6 +131,12 @@
 
 /* Verified ok */
 int luaopen_luaevent_core(lua_State* L) {
+#ifdef _WIN32
+	WORD wVersionRequested = MAKEWORD(2, 2);
+	WSADATA wsaData;
+	WSAStartup(wVersionRequested, &wsaData);
+#endif
+	event_init( );
 	/* Register external items */
 	event_callback_register(L);
 	event_buffer_register(L);
@@ -145,3 +155,4 @@
 	setNamedIntegers(L, consts);
 	return 1;
 }
+