Fix rockspec and serial.c module.

3 files changed, 6 insertions, 25 deletions

diff --git a/luasocket-scm-0.rockspec b/luasocket-scm-0.rockspec
index f86567b..352a497 100644
--- a/luasocket-scm-0.rockspec
+++ b/luasocket-scm-0.rockspec
@@ -50,13 +50,12 @@ local function make_plat(plat)
         }
         local modules = {
                 ["socket.core"] = {
-                        sources = { "src/luasocket.c", "src/timeout.c", "src/buffer.c", "src/io.c", "src/auxiliar.c",
-                                                "src/options.c", "src/inet.c", "src/except.c", "src/select.c", "src/tcp.c", "src/udp.c" },
+                        sources = { "src/luasocket.c", "src/timeout.c", "src/buffer.c", "src/io.c", "src/auxiliar.c", "src/options.c", "src/inet.c", "src/except.c", "src/select.c", "src/tcp.c", "src/udp.c", "src/compat.c" },
                         defines = defines[plat],
                         incdir = "/src"
                 },
-                ["mime.core"] = { 
-                        sources = { "src/mime.c" },
+                ["mime.core"] = {
+                        sources = { "src/mime.c", "src/compat.c" },
                         defines = defines[plat],
                         incdir = "/src"
                 },
@@ -73,14 +72,12 @@ local function make_plat(plat)
         if plat == "unix" or plat == "macosx" then
             modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c"
                 modules["socket.unix"] = {
-                  sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", 
-                                          "src/usocket.c", "src/unix.c" },
+                  sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", "src/usocket.c", "src/unix.c" },
                   defines = defines[plat],
                   incdir = "/src"
                 }
                 modules["socket.serial"] = {
-                  sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c",
-                                          "src/io.c", "src/usocket.c", "src/serial.c" },
+                  sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", "src/usocket.c", "src/serial.c" },
                   defines = defines[plat],
                   incdir = "/src"
                 }
diff --git a/src/compat.c b/src/compat.c
index bc5cc0e..c2d99cb 100644
--- a/src/compat.c
+++ b/src/compat.c
@@ -1,6 +1,6 @@
 #include "compat.h"
 
-#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM==501
+#if LUA_VERSION_NUM==501
 /*
 ** Adapted from Lua 5.2
 */
diff --git a/src/serial.c b/src/serial.c
index dedbeb5..7bdb21c 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -54,15 +54,6 @@ static luaL_Reg serial_methods[] = {
     {NULL,          NULL}
 };
 
-/* our socket creation function */
-/* this is an ad-hoc module that returns a single function
- * as such, do not include other functions in this array. */
-static luaL_Reg func[] = {
-    {"serial", global_create},
-    {NULL,          NULL}
-};
-
-
 /*-------------------------------------------------------------------------*\
 * Initializes module
 \*-------------------------------------------------------------------------*/
@@ -71,14 +62,7 @@ LUASOCKET_API int luaopen_socket_serial(lua_State *L) {
     auxiliar_newclass(L, "serial{client}", serial_methods);
     /* create class groups */
     auxiliar_add2group(L, "serial{client}", "serial{any}");
-#if LUA_VERSION_NUM > 501 && !defined(LUA_COMPAT_MODULE)
-    lua_pushcfunction(L, global_create);
-    (void) func;
-#else
-    /* set function into socket namespace */
-    luaL_openlib(L, "socket", func, 0);
     lua_pushcfunction(L, global_create);
-#endif
     return 1;
 }