Skip to content

Commit 1600ba2

Browse files
committed
Replaced LuaJIT libraries with VC14 compiled libraries
Removed the placeholder thread_local in favor of thread_local
1 parent a65289f commit 1600ba2

File tree

6 files changed

+2
-9
lines changed

6 files changed

+2
-9
lines changed

lib/lua51.lib

0 Bytes
Binary file not shown.

lib64/lua51_64.lib

-442 Bytes
Binary file not shown.

lua51.dll

2.5 KB
Binary file not shown.

lua51_64.dll

3 KB
Binary file not shown.

src/map/map.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,8 @@ const int8* MAP_CONF_FILENAME = nullptr;
7474

7575
int8* g_PBuff = nullptr; // глобальный буфер обмена пакетами
7676
int8* PTempBuff = nullptr; // временный буфер обмена пакетами
77-
#ifdef WIN32
78-
__declspec(thread) Sql_t* SqlHandle = nullptr; // SQL descriptor
79-
#else
77+
8078
thread_local Sql_t* SqlHandle = nullptr;
81-
#endif
8279

8380
int32 map_fd = 0; // main socket
8481
uint32 map_amntplayers = 0; // map amnt unique players

src/map/map.h

+1-5
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,8 @@ extern map_config_t map_config;
153153
extern uint32 map_amntplayers;
154154
extern int32 map_fd;
155155

156-
//temporary until VC13 (where thread_local is defined)
157-
#ifdef WIN32
158-
extern __declspec(thread) Sql_t* SqlHandle; // SQL descriptor
159-
#else
160156
extern thread_local Sql_t* SqlHandle;
161-
#endif
157+
162158
extern CCommandHandler CmdHandler;
163159

164160
typedef std::map<uint64,map_session_data_t*> map_session_list_t;

0 commit comments

Comments
 (0)