Merge branch 'v0.2' default/master default/mob mob

Wed, 15 Jul 2009 10:39:10 -0400

author
Thomas Harning Jr <harningt@gmail.com>
date
Wed, 15 Jul 2009 10:39:10 -0400
changeset 64
dd47dbe85bec
parent 62
ed98dcbaacb0 (current diff)
parent 63
1b8cbf640378 (diff)
child 65
e65466cee871
child 92
57662d96d8a8

Merge branch 'v0.2'

src/luaevent.c file | annotate | diff | comparison | revisions
--- 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;
 }
+

mercurial