diff --git a/.gitignore b/.gitignore
index 8307483..9ed661c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@
*.dll*
*.user
*.sdf
-Lua.props
Debug
Release
*.manifest
diff --git a/Lua.props b/Lua.props
new file mode 100755
index 0000000..bdfca40
--- /dev/null
+++ b/Lua.props
@@ -0,0 +1,28 @@
+
+
+
+
+ z:\data\build\vc14\
+ $(BUILD)\bin\lua\5.3\
+ $(BUILD)\lib\lua\5.3\
+ $(BUILD)\include\lua\5.3\
+
+
+ <_PropertySheetDisplayName>Lua53
+
+
+
+
+ $(LUALIB)
+
+
+ $(LUAINC)
+
+
+ $(LUABIN)
+
+
+ $(BUILD)
+
+
+
diff --git a/Lua51.props b/Lua51.props
deleted file mode 100644
index 1bd6256..0000000
--- a/Lua51.props
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
- ..\build\vc12\bin\lua\5.1\
- ..\build\vc12\bin\lua\5.1\
- ..\build\vc12\include\lua\5.1\
- lua51.lib
-
-
- <_PropertySheetDisplayName>Lua51
-
-
-
-
- $(LUALIB_PATH)
-
-
- $(LUABIN_PATH)
-
-
- $(LUAINC_PATH)
-
-
- $(LUALIB)
-
-
-
diff --git a/Lua52.props b/Lua52.props
deleted file mode 100644
index 01afcfa..0000000
--- a/Lua52.props
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
- ..\build\vc12\bin\lua\5.2\
- ..\build\vc12\bin\lua\5.2\
- ..\build\vc12\include\lua\5.2\
- lua52.lib
-
-
- <_PropertySheetDisplayName>Lua52
-
-
-
-
- $(LUALIB_PATH)
-
-
- $(LUABIN_PATH)
-
-
- $(LUAINC_PATH)
-
-
- $(LUALIB)
-
-
-
diff --git a/mime.vcxproj b/mime.vcxproj
index c77d611..74bba0c 100755
--- a/mime.vcxproj
+++ b/mime.vcxproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -24,39 +24,40 @@
Document
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)
- $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension)
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)
- $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension)
- copy %(FullPath) $(LUALIB_PATH)$(Platform)\$(Configuration)
- copy %(FullPath) $(LUALIB_PATH)$(Platform)\$(Configuration)
- $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension)
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
{128E8BD0-174A-48F0-8771-92B1E8D18713}
Win32Proj
+ 10.0.15063.0
DynamicLibrary
- v110
+ v141
MultiByte
DynamicLibrary
- v110
+ v141
MultiByte
DynamicLibrary
- v110
+ v141
MultiByte
DynamicLibrary
- v110
+ v141
MultiByte
@@ -87,7 +88,7 @@
<_ProjectFileVersion>11.0.50727.1
- $(LUABIN_PATH)$(Configuration)\mime\
+ $(LUABIN)$(Configuration)\mime\
$(Configuration)\
true
core
@@ -95,23 +96,23 @@
true
core
- $(LUABIN_PATH)$(Platform)\$(Configuration)\mime\
+ $(LUABIN)$(Platform)\$(Configuration)\mime\
- $(LUABIN_PATH)$(Configuration)\mime\
+ $(LUABIN)$(Configuration)\mime\
$(Configuration)\
false
core
false
- $(LUABIN_PATH)$(Platform)\$(Configuration)\mime\
+ $(LUABIN)$(Platform)\$(Configuration)\mime\
core
Disabled
- $(LUAINC_PATH);%(AdditionalIncludeDirectories)
+ $(LUAINC);%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -122,9 +123,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- $(LUALIB);%(AdditionalDependencies)
+ lualib.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)
true
$(OutDir)mime.pdb
Windows
@@ -138,7 +139,7 @@
Disabled
- $(LUAINC_PATH);%(AdditionalIncludeDirectories)
+ $(LUAINC);%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebugDLL
@@ -149,9 +150,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- $(LUALIB);%(AdditionalDependencies)
+ lualib.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
true
$(OutDir)mime.pdb
Windows
@@ -163,7 +164,7 @@
- $(LUAINC_PATH);%(AdditionalIncludeDirectories)
+ $(LUAINC);%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
MultiThreadedDLL
@@ -172,9 +173,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- $(LUALIB);%(AdditionalDependencies)
+ lualib.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)
true
Windows
true
@@ -187,7 +188,7 @@
- $(LUAINC_PATH);%(AdditionalIncludeDirectories)
+ $(LUAINC);%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
MultiThreadedDLL
@@ -198,9 +199,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- $(LUALIB);%(AdditionalDependencies)
+ lualib.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
true
Windows
true
@@ -214,4 +215,4 @@
-
\ No newline at end of file
+
diff --git a/socket.vcxproj b/socket.vcxproj
index 16daeef..cfa32b3 100755
--- a/socket.vcxproj
+++ b/socket.vcxproj
@@ -1,5 +1,5 @@
-
+
Debug
@@ -35,118 +35,119 @@
Document
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)
- $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension)
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
Document
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)
- $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension)
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
Document
- $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
Document
- $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
Document
- $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
Document
- $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
Document
- $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
Document
- $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)
- $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket
- copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
+ $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}
Win32Proj
+ 10.0.15063.0
DynamicLibrary
- v110
+ v141
MultiByte
DynamicLibrary
- v110
+ v141
MultiByte
DynamicLibrary
- v110
+ v141
MultiByte
DynamicLibrary
- v110
+ v141
MultiByte
@@ -177,7 +178,7 @@
<_ProjectFileVersion>11.0.50727.1
- $(LUALIB_PATH)$(Configuration)\socket\
+ $(LUABIN)$(Configuration)\socket\
$(Configuration)\
true
core
@@ -185,23 +186,23 @@
true
core
- $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\
+ $(LUABIN)$(Platform)\$(Configuration)\socket\
- $(LUALIB_PATH)$(Configuration)\socket\
+ $(LUABIN)$(Configuration)\socket\
$(Configuration)\
false
core
false
- $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\
+ $(LUABIN)$(Platform)\$(Configuration)\socket\
core
Disabled
- $(LUAINC_PATH);%(AdditionalIncludeDirectories)
+ $(LUAINC);%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUASOCKET_DEBUG;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -212,9 +213,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- $(LUALIB);ws2_32.lib;%(AdditionalDependencies)
+ lualib.lib;ws2_32.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)
true
$(OutDir)mime.pdb
Windows
@@ -228,7 +229,7 @@
Disabled
- $(LUAINC_PATH);%(AdditionalIncludeDirectories)
+ $(LUAINC);%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUASOCKET_DEBUG;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebugDLL
@@ -239,9 +240,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- $(LUALIB);ws2_32.lib;%(AdditionalDependencies)
+ lualib.lib;ws2_32.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
true
$(OutDir)mime.pdb
Windows
@@ -253,7 +254,7 @@
- $(LUAINC_PATH);%(AdditionalIncludeDirectories)
+ $(LUAINC);%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
MultiThreadedDLL
@@ -262,9 +263,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- $(LUALIB);ws2_32.lib;%(AdditionalDependencies)
+ lualib.lib;ws2_32.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)
true
Windows
true
@@ -277,7 +278,7 @@
- $(LUAINC_PATH);%(AdditionalIncludeDirectories)
+ $(LUAINC);%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
MultiThreadedDLL
@@ -288,9 +289,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- $(LUALIB);ws2_32.lib;%(AdditionalDependencies)
+ lualib.lib;ws2_32.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
true
Windows
true
@@ -304,4 +305,4 @@
-
\ No newline at end of file
+
diff --git a/src/luasocket.c b/src/luasocket.c
old mode 100644
new mode 100755
index 7d9c802..d2752a7
--- a/src/luasocket.c
+++ b/src/luasocket.c
@@ -64,7 +64,7 @@ static luaL_Reg func[] = {
* Skip a few arguments
\*-------------------------------------------------------------------------*/
static int global_skip(lua_State *L) {
- int amount = luaL_checkinteger(L, 1);
+ int amount = (int) luaL_checkinteger(L, 1);
int ret = lua_gettop(L) - amount - 1;
return ret >= 0 ? ret : 0;
}
diff --git a/src/makefile b/src/makefile
index 494baab..1ed3f4f 100644
--- a/src/makefile
+++ b/src/makefile
@@ -386,7 +386,7 @@ $(UNIX_SO): $(UNIX_OBJS)
$(SERIAL_SO): $(SERIAL_OBJS)
$(LD) $(SERIAL_OBJS) $(LDFLAGS)$@
-install:
+install:
$(INSTALL_DIR) $(INSTALL_TOP_LDIR)
$(INSTALL_DATA) $(TO_TOP_LDIR) $(INSTALL_TOP_LDIR)
$(INSTALL_DIR) $(INSTALL_SOCKET_LDIR)
diff --git a/src/mime.c b/src/mime.c
old mode 100644
new mode 100755
index db356fc..338ecd4
--- a/src/mime.c
+++ b/src/mime.c
@@ -654,7 +654,7 @@ static int eolprocess(int c, int last, const char *marker,
\*-------------------------------------------------------------------------*/
static int mime_global_eol(lua_State *L)
{
- int ctx = luaL_checkinteger(L, 1);
+ int ctx = (int) luaL_checkinteger(L, 1);
size_t isize = 0;
const char *input = luaL_optlstring(L, 2, NULL, &isize);
const char *last = input + isize;
diff --git a/src/wsocket.c b/src/wsocket.c
old mode 100644
new mode 100755
index 8ecb0fc..ac8411f
--- a/src/wsocket.c
+++ b/src/wsocket.c
@@ -131,11 +131,11 @@ int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) {
/* we wait until something happens */
err = socket_waitfd(ps, WAITFD_C, tm);
if (err == IO_CLOSED) {
- int len = sizeof(err);
+ int elen = sizeof(err);
/* give windows time to set the error (yes, disgusting) */
Sleep(10);
/* find out why we failed */
- getsockopt(*ps, SOL_SOCKET, SO_ERROR, (char *)&err, &len);
+ getsockopt(*ps, SOL_SOCKET, SO_ERROR, (char *)&err, &elen);
/* we KNOW there was an error. if 'why' is 0, we will return
* "unknown error", but it's not really our fault */
return err > 0? err: IO_UNKNOWN;