File tree 6 files changed +2
-9
lines changed
6 files changed +2
-9
lines changed Original file line number Diff line number Diff line change @@ -74,11 +74,8 @@ const int8* MAP_CONF_FILENAME = nullptr;
74
74
75
75
int8* g_PBuff = nullptr ; // глобальный буфер обмена пакетами
76
76
int8* PTempBuff = nullptr ; // временный буфер обмена пакетами
77
- #ifdef WIN32
78
- __declspec (thread) Sql_t* SqlHandle = nullptr; // SQL descriptor
79
- #else
77
+
80
78
thread_local Sql_t* SqlHandle = nullptr ;
81
- #endif
82
79
83
80
int32 map_fd = 0 ; // main socket
84
81
uint32 map_amntplayers = 0 ; // map amnt unique players
Original file line number Diff line number Diff line change @@ -153,12 +153,8 @@ extern map_config_t map_config;
153
153
extern uint32 map_amntplayers;
154
154
extern int32 map_fd;
155
155
156
- // temporary until VC13 (where thread_local is defined)
157
- #ifdef WIN32
158
- extern __declspec (thread) Sql_t* SqlHandle; // SQL descriptor
159
- #else
160
156
extern thread_local Sql_t* SqlHandle;
161
- # endif
157
+
162
158
extern CCommandHandler CmdHandler;
163
159
164
160
typedef std::map<uint64,map_session_data_t *> map_session_list_t ;
You can’t perform that action at this time.
0 commit comments