ffi: Add support for MSVC compilation.

y-scope · Mar 31, 2024 · 6eb6806 · 6eb6806
1 parent 2b884bd
commit 6eb6806
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/components/core/src/ffi/ir_stream/byteswap.hpp b/components/core/src/ffi/ir_stream/byteswap.hpp
@@ -1,11 +1,16 @@
 #ifndef FFI_IR_STREAM_BYTESWAP_HPP
 #define FFI_IR_STREAM_BYTESWAP_HPP
 
-#ifdef __APPLE__
+#if defined(__APPLE__)
     #include <libkern/OSByteOrder.h>
     #define bswap_16(x) OSSwapInt16(x)
     #define bswap_32(x) OSSwapInt32(x)
     #define bswap_64(x) OSSwapInt64(x)
+#elif defined(_MSC_VER)
+    #include <stdlib.h>
+    #define bswap_16(x) _byteswap_ushort(x)
+    #define bswap_32(x) _byteswap_ulong(x)
+    #define bswap_64(x) _byteswap_uint64(x)
 #else
     #include <byteswap.h>
 #endif

diff --git a/components/core/src/string_utils.inc b/components/core/src/string_utils.inc
@@ -5,8 +5,14 @@
 
 template <typename integer_t>
 bool convert_string_to_int(std::string_view raw, integer_t& converted) {
+#if defined(_MSC_VER)
+    auto raw_begin = raw.data();
+    auto raw_end = raw_begin + raw.size();
+#else
+    auto raw_begin = raw.cbegin();
     auto raw_end = raw.cend();
-    auto result = std::from_chars(raw.cbegin(), raw_end, converted);
+#endif
+    auto result = std::from_chars(raw_begin, raw_end, converted);
     if (raw_end != result.ptr) {
         return false;
     } else {