Skip to content

Commit 3e1de86

Browse files
committed
modify:windows macro define name
1 parent b84d692 commit 3e1de86

File tree

7 files changed

+14
-17
lines changed

7 files changed

+14
-17
lines changed

XEngine_Source/StorageModule_APIHelp/pch.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#ifndef PCH_H
88
#define PCH_H
99

10-
#ifdef _WINDOWS
10+
#ifdef _MSC_BUILD
1111
// 添加要在此处预编译的标头
1212
#include "framework.h"
1313
#include <tchar.h>
@@ -59,7 +59,7 @@ using namespace std;
5959
extern bool APIHelp_IsErrorOccur;
6060
extern XLONG APIHelp_dwErrorCode;
6161

62-
#ifdef _WINDOWS
62+
#ifdef _MSC_BUILD
6363
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
6464
#pragma comment(lib,"XEngine_Core/XEngine_OPenSsl")
6565
#pragma comment(lib,"XEngine_RfcComponents/RfcComponents_HttpProtocol")

XEngine_Source/StorageModule_Config/pch.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#ifndef PCH_H
88
#define PCH_H
99

10-
#ifdef _WINDOWS
10+
#ifdef _MSC_BUILD
1111
// 添加要在此处预编译的标头
1212
#include "framework.h"
1313
#include <tchar.h>
@@ -40,7 +40,7 @@ using namespace std;
4040
extern bool Config_IsErrorOccur;
4141
extern XLONG Config_dwErrorCode;
4242

43-
#ifdef _WINDOWS
43+
#ifdef _MSC_BUILD
4444
#ifdef _DEBUG
4545
#ifdef _WIN64
4646
#pragma comment(lib,"../x64/Debug/jsoncpp")

XEngine_Source/StorageModule_Database/pch.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#ifndef PCH_H
88
#define PCH_H
99

10-
#ifdef _WINDOWS
10+
#ifdef _MSC_BUILD
1111
// 添加要在此处预编译的标头
1212
#include "framework.h"
1313
#include <conio.h>
@@ -55,7 +55,7 @@ using namespace std;
5555
extern bool Database_IsErrorOccur;
5656
extern XLONG Database_dwErrorCode;
5757

58-
#ifdef _WINDOWS
58+
#ifdef _MSC_BUILD
5959
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
6060
#pragma comment(lib,"XEngine_HelpComponents/HelpComponents_DataBase.lib")
6161
#endif

XEngine_Source/StorageModule_Protocol/pch.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#ifndef PCH_H
88
#define PCH_H
99

10-
#ifdef _WINDOWS
10+
#ifdef _MSC_BUILD
1111
// 添加要在此处预编译的标头
1212
#include "framework.h"
1313
#include <stdlib.h>
@@ -54,7 +54,7 @@ using namespace std;
5454
extern bool Protocol_IsErrorOccur;
5555
extern XLONG Protocol_dwErrorCode;
5656

57-
#ifdef _WINDOWS
57+
#ifdef _MSC_BUILD
5858
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
5959
#ifdef _DEBUG
6060
#ifdef _WIN64

XEngine_Source/StorageModule_Session/pch.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#ifndef PCH_H
88
#define PCH_H
99

10-
#ifdef _WINDOWS
10+
#ifdef _MSC_BUILD
1111
// 添加要在此处预编译的标头
1212
#include "framework.h"
1313
#include <tchar.h>
@@ -49,6 +49,6 @@ using namespace std;
4949
extern bool Session_IsErrorOccur;
5050
extern XLONG Session_dwErrorCode;
5151

52-
#ifdef _WINDOWS
52+
#ifdef _MSC_BUILD
5353
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
5454
#endif

XEngine_Source/XEngine_StorageApp/StorageApp_Hdr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ extern XENGINE_LBCONFIG st_LoadbalanceCfg;
105105
#include "Storage_APPTask/Storage_TaskP2p.h"
106106
#include "Storage_APPTask/Storage_TaskManage.h"
107107

108-
#ifdef _WINDOWS
108+
#ifdef _MSC_BUILD
109109
#pragma comment(lib,"Ws2_32.lib")
110110
#pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib.lib")
111111
#pragma comment(lib,"XEngine_BaseLib/XEngine_Algorithm.lib")

XEngine_Source/XEngine_StorageApp/XEngine_StorageApp.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void ServiceApp_Stop(int signo)
7474
}
7575
static int ServiceApp_Deamon(int wait)
7676
{
77-
#ifndef _WINDOWS
77+
#ifndef _MSC_BUILD
7878
pid_t pid = 0;
7979
int status;
8080
pid = fork();
@@ -105,10 +105,7 @@ static int ServiceApp_Deamon(int wait)
105105

106106
int main(int argc, char** argv)
107107
{
108-
#if (XENGINE_VERSION_KERNEL < 7) && (XENGINE_VERSION_MAIN < 24)
109-
printf("XEngine版本过低,无法继续\n");
110-
#endif
111-
#ifdef _WINDOWS
108+
#ifdef _MSC_BUILD
112109
WSADATA st_WSAData;
113110
WSAStartup(MAKEWORD(2, 2), &st_WSAData);
114111
#endif
@@ -466,7 +463,7 @@ int main(int argc, char** argv)
466463
pSTDThread->join();
467464
}
468465
}
469-
#ifdef _WINDOWS
466+
#ifdef _MSC_BUILD
470467
WSACleanup();
471468
#endif
472469
return 0;

0 commit comments

Comments
 (0)