Skip to content

Commit acc91a7

Browse files
committed
fixed:linux build error and update CHANGELOG
1 parent 76adf93 commit acc91a7

File tree

3 files changed

+28
-5
lines changed

3 files changed

+28
-5
lines changed

CHANGELOG

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
XEngine_Storage V3.12.0.1001
2+
3+
增加:为P2P启用内存数据库支持
4+
修改:为P2P功能单独启用配置选项
5+
修改:http验证回调发送数据字段被填充了
6+
修改:WINDOWS宏定义
7+
修正:重载配置的错误
8+
修正:数据库时间处理不正确
9+
删除:业务分布式功能被删除
10+
删除:没有使用的配置代码
11+
12+
added:memory database supported for p2p
13+
modify:The configuration for enabling P2P is set up as a separate project.
14+
modify:http authorize callback send len is useful
15+
modify:windows macro define name
16+
fixed:reload configure is incorrent
17+
fixed:database thread time is incorrent
18+
delete:center Distributed function,it is useless
19+
delete:unuse configure field
20+
======================================================================================
121
XEngine_Storage V3.11.1.1001
222

323
更新:匹配XEngine V8.15版本

XEngine_Source/StorageModule_Database/Database_Memory/Database_Memory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,21 +286,21 @@ bool CDatabase_Memory::Database_Memory_Flush()
286286

287287
memset(tszFoundDir, '\0', MAX_PATH);
288288
_tcsxcpy(tszFoundDir, stl_ListIterator->tszFilePath);
289-
_tcsxcat(tszFoundDir, _T("/*"));
289+
_tcsxcat(tszFoundDir, _X("/*"));
290290

291291
SystemApi_File_EnumFile(tszFoundDir, &pptszListFile, &nListCount, NULL, NULL, true, 1);
292292
for (int i = 0; i < nListCount; i++)
293293
{
294294
int nHashLen = 0;
295295
struct _xtstat st_FileStatus;
296+
296297
XBYTE tszHashStr[MAX_PATH];
297298
XSTORAGECORE_DBFILE st_DBFile;
298299

299300
memset(tszHashStr, '\0', MAX_PATH);
300301
memset(&st_DBFile, '\0', sizeof(XSTORAGECORE_DBFILE));
301302

302303
_xtstat(pptszListFile[i], &st_FileStatus);
303-
304304
if (st_FileStatus.st_size > 0)
305305
{
306306
st_DBFile.st_ProtocolFile.nFileSize = st_FileStatus.st_size;

XEngine_Source/StorageModule_Database/pch.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@
1616
#include <time.h>
1717
#include <WinSock2.h>
1818
#else
19+
#include <sys/types.h>
20+
#include <sys/stat.h>
21+
#include <unistd.h>
22+
#include <pthread.h>
23+
#endif
24+
#endif //PCH_H
1925
#include <stdio.h>
2026
#include <stdlib.h>
2127
#include <string.h>
2228
#include <errno.h>
23-
#include <pthread.h>
24-
#endif
25-
#endif //PCH_H
2629
#include <list>
2730
#include <memory>
2831
#include <thread>

0 commit comments

Comments
 (0)