diff --git a/general/.vscode/settings.json b/general/.vscode/settings.json new file mode 100644 index 0000000..90d3512 --- /dev/null +++ b/general/.vscode/settings.json @@ -0,0 +1,7 @@ +{ + "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools", + "files.associations": { + "cstring": "cpp", + "memory": "cpp" + } +} \ No newline at end of file diff --git a/general/inc/debug.h b/general/inc/debug.h index 50dfe86..5652b03 100644 --- a/general/inc/debug.h +++ b/general/inc/debug.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include using namespace std; int dumpObj(void *dst,int rowNum,int num,bool ifAsii,char *out); diff --git a/general/inc/utils.h b/general/inc/utils.h index fe4f36b..0aa4aae 100644 --- a/general/inc/utils.h +++ b/general/inc/utils.h @@ -12,6 +12,21 @@ using namespace std; + +typedef enum { + ENV_WINDOWS = 1, + ENV_LINUX, + ENV_UNIX +}ENV_SYS; + +typedef enum{ + GCC = 1, + CLANG = 2, + CL = 3 +}ENV_COMPILER; +inline ENV_SYS CurrentEnvSys(); +inline ENV_COMPILER CurrentEnvCompiler(); + #define RELEASE_MEMORY(x) \ if(nullptr == x) \ { \ diff --git a/general/src/net/PackageReceiver.h b/general/src/net/PackageReceiver.h index 2a53b60..fb73f69 100644 --- a/general/src/net/PackageReceiver.h +++ b/general/src/net/PackageReceiver.h @@ -1,6 +1,9 @@ #pragma once + #include #include +#include + #define BUFFER_MAX 1024//每个包的最大包头 typedef enum { diff --git a/general/src/net/TcpClient.h b/general/src/net/TcpClient.h index b70bcc6..8948127 100644 --- a/general/src/net/TcpClient.h +++ b/general/src/net/TcpClient.h @@ -16,6 +16,7 @@ extern "C"{ #include "third/include/event2/event.h" #include "third/include/event2/thread.h" }; + #include #include "PackageReceiver.h" #include diff --git a/general/src/utils.cpp b/general/src/utils.cpp index 45639cf..477440c 100644 --- a/general/src/utils.cpp +++ b/general/src/utils.cpp @@ -8,3 +8,26 @@ string itos(int x){ itoa(x,buf,10); return string(buf); } + +inline ENV_SYS CurrentEnvSys(){ + #ifdef linux + return ENV_LINUX + #endif + #ifdef _WINDOWS + return ENV_WINDOWS + #endif + #ifdef _UNIX + return ENV_UNIX + #endif +} +inline ENV_COMPILER CurrentEnvCompiler(){ + ifdef __GNUC__ + return GCC; + #endif + ifdef _MSC_VER + return CL; + #endif + ifdef __clang__ + return CLANG; + #endif +}