summaryrefslogtreecommitdiff
path: root/src/socket/socket.lua.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-05-12 01:47:13 (GMT)
committer jacob1 <jfu614@gmail.com>2013-05-12 01:47:13 (GMT)
commit51f27bfad72e7fbc72388f63c3b8a48162e509a1 (patch)
treeabd95cad4e12085fb8a67f63bce788db44f61f03 /src/socket/socket.lua.cpp
parent9d89d4b79b26584490e55cfb992fc58d3e11ea2b (diff)
parenta0a0e305a92b41923f7634fca1d30b0e71ee12e0 (diff)
downloadpowder-51f27bfad72e7fbc72388f63c3b8a48162e509a1.zip
powder-51f27bfad72e7fbc72388f63c3b8a48162e509a1.tar.gz
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/socket/socket.lua.cpp')
-rw-r--r--src/socket/socket.lua.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/socket/socket.lua.cpp b/src/socket/socket.lua.cpp
index 80b32f7..4952cce 100644
--- a/src/socket/socket.lua.cpp
+++ b/src/socket/socket.lua.cpp
@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
// socket.lua from luasocket compiled into a cpp file
extern "C" {
#include "lua.h"
@@ -10,3 +11,4 @@ void luaopen_socket(lua_State *l){
luaL_loadbuffer(l, socket_luac, socket_luac_sz, "@builtin socket.lua");
lua_call(l, 0, 0);
}
+#endif