Skip to content

Commit 7c58999

Browse files
committed
Convert vendor line endings to LF
1 parent d44b669 commit 7c58999

File tree

6 files changed

+1355
-1355
lines changed

6 files changed

+1355
-1355
lines changed

premake5.lua

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
1-
project "Lua_Server"
2-
language "C++"
3-
targetname "lua5.1"
4-
5-
vpaths {
6-
["Headers"] = "**.h",
7-
["Sources"] = "**.c",
8-
["*"] = "premake5.lua"
9-
}
10-
11-
files {
12-
"premake5.lua",
13-
"src/**.c",
14-
"src/**.h",
15-
}
16-
17-
defines { "LUA_BUILD_AS_DLL" }
18-
19-
filter "system:windows"
20-
kind "SharedLib"
21-
targetdir(buildpath("server/mods/deathmatch"))
22-
23-
filter "system:not windows"
24-
kind "StaticLib"
25-
26-
filter {"system:windows", "platforms:x64"}
27-
targetdir(buildpath("server/x64"))
28-
29-
30-
if os.target() == "windows" then
31-
project "Lua_Client"
32-
language "C++"
33-
kind "SharedLib"
34-
targetname "lua5.1c"
35-
targetdir(buildpath("mods/deathmatch"))
36-
37-
vpaths {
38-
["Headers"] = "**.h",
39-
["Sources"] = "**.c",
40-
["*"] = "premake5.lua"
41-
}
42-
43-
files {
44-
"premake5.lua",
45-
"src/**.c",
46-
"src/**.h",
47-
}
48-
49-
defines {
50-
"LUA_USE_APICHECK",
51-
"LUA_BUILD_AS_DLL"
52-
}
53-
54-
filter "platforms:x64"
55-
flags { "ExcludeFromBuild" }
56-
end
1+
project "Lua_Server"
2+
language "C++"
3+
targetname "lua5.1"
4+
5+
vpaths {
6+
["Headers"] = "**.h",
7+
["Sources"] = "**.c",
8+
["*"] = "premake5.lua"
9+
}
10+
11+
files {
12+
"premake5.lua",
13+
"src/**.c",
14+
"src/**.h",
15+
}
16+
17+
defines { "LUA_BUILD_AS_DLL" }
18+
19+
filter "system:windows"
20+
kind "SharedLib"
21+
targetdir(buildpath("server/mods/deathmatch"))
22+
23+
filter "system:not windows"
24+
kind "StaticLib"
25+
26+
filter {"system:windows", "platforms:x64"}
27+
targetdir(buildpath("server/x64"))
28+
29+
30+
if os.target() == "windows" then
31+
project "Lua_Client"
32+
language "C++"
33+
kind "SharedLib"
34+
targetname "lua5.1c"
35+
targetdir(buildpath("mods/deathmatch"))
36+
37+
vpaths {
38+
["Headers"] = "**.h",
39+
["Sources"] = "**.c",
40+
["*"] = "premake5.lua"
41+
}
42+
43+
files {
44+
"premake5.lua",
45+
"src/**.c",
46+
"src/**.h",
47+
}
48+
49+
defines {
50+
"LUA_USE_APICHECK",
51+
"LUA_BUILD_AS_DLL"
52+
}
53+
54+
filter "platforms:x64"
55+
flags { "ExcludeFromBuild" }
56+
end

src/ldump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "lobject.h"
1515
#include "lstate.h"
1616
#include "lundump.h"
17-
#ifdef WITH_STRING_DUMP
17+
#ifdef WITH_STRING_DUMP
1818

1919
typedef struct {
2020
lua_State* L;

src/lua.rc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
0 ICON "..\\etc\\lua.ico"
2-
3-
#ifdef WIN64
4-
1 24 "lua_64.manifest"
5-
#endif
1+
0 ICON "..\\etc\\lua.ico"
2+
3+
#ifdef WIN64
4+
1 24 "lua_64.manifest"
5+
#endif

src/luaconf.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@
383383
#if defined(LUA_USE_APICHECK)
384384
/////////////////////////////////////////////////////////////////////////
385385
// MTA addition for testing if apicheck will function as expected, and generating more useful crash dumps
386-
#undef assert
387-
#define assert(_Expression) (void)( (!!(_Expression)) || ( *((int*)NULL) = 0) )
386+
#undef assert
387+
#define assert(_Expression) (void)( (!!(_Expression)) || ( *((int*)NULL) = 0) )
388388
LUA_API int luaX_is_apicheck_enabled();
389389
/////////////////////////////////////////////////////////////////////////
390390
#define luai_apicheck(L,o) { (void)L; assert(o); }

0 commit comments

Comments
 (0)