amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

修复在WINDOWS上cpu类型无法判断BUG

Browse Source
This commit is contained in:
baiyfcu 2023-03-17 01:31:56 +08:00
parent 1dec350dcd
commit a754a22680
1 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/Http/HttpRequester.cpp
View File

@ -72,6 +72,58 @@ static std::string httpBody() {
os = "unknow"; os = "unknow";
#endif #endif
#if (defined(_WIN32) && !defined(WIN32))
#define WIN32 _WIN32
#elif (defined(WIN32) && !defined(_WIN32))
#define _WIN32 WIN32
#endif
#if (defined(_WIN32) && !defined(_MSC_VER) && !defined(_WIN64))
#ifndef __i386__
#define __i386__
#endif
#elif defined(_MSC_VER)
#if (defined(_M_IX86) && !defined(__i386__))
#define __i386__
#endif
#endif
#ifndef __i386__
#if (defined(__386__) || defined(__I386__) || _M_IX86)
#define __i386__
#endif
#endif
#if (defined(__i386__) && !defined(__I386__))
#define __I386__
#endif
#if (defined(__x86_64__) && !defined(__x86_64))
#define __x86_64
#endif
#if (defined(__x86_64) && !defined(__x86_64__))
#define __x86_64__
#endif
#if (defined(_M_AMD64)) && (!defined(__amd64__))
#define __amd64__
#endif
#if (defined(__amd64) && !defined(__amd64__))
#define __amd64__
#endif
#if (defined(__amd64__) && !defined(__amd64))
#define __amd64
#endif
#if (defined(__i386__) || defined(__amd64__)) && (!defined(__x86__))
#if !(defined(_MSC_VER) && defined(__amd64__))
#define __x86__ // MSVC doesn't support inline assembly in x64
#endif
#endif
auto &arch = args["arch"]; auto &arch = args["arch"];
#if defined(__x86_64__) || defined(__amd64__) #if defined(__x86_64__) || defined(__amd64__)
arch = "x86_64"; arch = "x86_64";