mirror/openvpn3
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn3.git synced 2024-09-20 04:02:15 +02:00
Code

Add some preprocessor checks for Windows ARM64

Browse Source 
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
This commit is contained in:
Frank Lichtenheld 2023-04-24 14:37:44 +02:00
parent 91cd3146cd
commit 5a84a32f9f
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openvpn/common/arch.hpp
View File

@ -28,7 +28,7 @@
#define OPENVPN_ARCH_x86_64
#elif defined(__i386__) || defined(_M_IX86)
#define OPENVPN_ARCH_i386
#elif defined(__aarch64__) || defined(__arm64__)
#elif defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64)
#define OPENVPN_ARCH_ARM64
#elif defined(__arm__) || defined(_M_ARM)
#define OPENVPN_ARCH_ARM

2
openvpn/common/olong.hpp
View File

@ -26,7 +26,7 @@
// on 64-bit machines.
namespace openvpn {
#if defined(_MSC_VER) && defined(_M_X64)
#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64))
typedef long long olong;
typedef unsigned long long oulong;
#else

16
openvpn/common/platform_string.hpp
View File

@ -19,12 +19,12 @@
// along with this program in the COPYING file.
// If not, see <http://www.gnu.org/licenses/>.
#ifndef OPENVPN_COMMON_PLATFORM_STRING_H
#define OPENVPN_COMMON_PLATFORM_STRING_H
#pragma once
#include <string>
#include <sstream>
#include <openvpn/common/arch.hpp>
#include <openvpn/common/version.hpp>
#include <openvpn/common/platform_name.hpp>
@ -41,13 +41,13 @@ inline std::string platform_string(const std::string &title, const std::string &
os << "(" << OPENVPN_CORE_GIT_VERSION << ")";
#endif
os << ' ' << platform_name();
#if defined(__amd64__) || defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64)
#if defined(OPENVPN_ARCH_x86_64)
os << " x86_64";
#elif defined(__i386__) || defined(_M_IX86)
#elif defined(OPENVPN_ARCH_i386)
os << " i386";
#elif defined(__aarch64__) || defined(__arm64__)
#elif defined(OPENVPN_ARCH_ARM64)
os << " arm64";
#elif defined(__arm__) || defined(_M_ARM)
#elif defined(OPENVPN_ARCH_ARM)
#if defined(__ARM_ARCH_7S__) || defined(_ARM_ARCH_7S)
os << " armv7s";
#elif defined(__ARM_ARCH_7A__)
@ -62,7 +62,7 @@ inline std::string platform_string(const std::string &title, const std::string &
#elif defined(__thumb__) || defined(_M_ARMT)
os << " thumb";
#endif
#endif
#endif // defined(OPENVPN_ARCH_ARM)
os << ' ' << (sizeof(void *) * 8) << "-bit";
return os.str();
@ -73,5 +73,3 @@ inline std::string platform_string()
return platform_string("OpenVPN core", "");
}
} // namespace openvpn
#endif // OPENVPN_COMMON_PLATFORM_STRING_H