Skip to content

[pull] master from GaijinEntertainment:master #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Dec 1, 2025
Merged

[pull] master from GaijinEntertainment:master #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7b100d
fix linux 32-bit (__ILP32__) compilation
virt00l Dec 1, 2025
1766ca6
Merge pull request #1949 from virt00l/fix-linux-ilp32-compilation
borisbat Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/daScript/ast/ast_typedecl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "daScript/ast/ast_typefactory.h"
#include "daScript/simulate/jit_abi.h"
#include "daScript/misc/free_list.h"
#include <limits.h> // ULLONG_MAX
#include <limits.h> // ULONG_MAX

namespace das {

Expand Down Expand Up @@ -334,7 +334,7 @@ namespace das {
template<> struct ToBasicType<long double> { enum { type = Type::tDouble }; };
template<> struct ToBasicType<wchar_t> { enum { type = Type::tUInt16 }; };
#endif
#if !defined(_MSC_VER) && !defined(__APPLE__) && !defined(_EMSCRIPTEN_VER) && defined(ULLONG_MAX) && ULLONG_MAX == 0xffffffffffffffffULL
#if !defined(_MSC_VER) && !defined(__APPLE__) && !defined(_EMSCRIPTEN_VER) && defined(ULONG_MAX) && ULONG_MAX == UINT64_MAX
template<> struct ToBasicType<long long int> { enum { type = Type::tInt64 }; };
template<> struct ToBasicType<unsigned long long int> { enum { type = Type::tUInt64 }; };
#endif
Expand Down
2 changes: 1 addition & 1 deletion include/daScript/misc/platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ inline size_t das_aligned_memsize(void * ptr){
#define DAS_MACRO_SANITIZER 0
#endif

#if !_TARGET_64BIT && !defined(__clang__) && (_MSC_VER <= 1900)
#if defined(_M_IX86) && defined(_MSC_VER) && !defined(__clang__) && _MSC_VER <= 1900
#define _msc_inline_bug __declspec(noinline)
#else
#define _msc_inline_bug __forceinline
Expand Down
4 changes: 2 additions & 2 deletions include/daScript/simulate/cast.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "daScript/misc/vectypes.h"
#include "daScript/misc/arraytype.h"
#include "daScript/misc/rangetype.h"
#include <limits.h> // ULLONG_MAX
#include <limits.h> // ULONG_MAX

namespace das
{
Expand Down Expand Up @@ -338,7 +338,7 @@ namespace das
static __forceinline vec4f from ( uint64_t x ) { return v_cast_vec4f(v_ldui_half(&x)); }
};

#if !defined(_MSC_VER) && !defined(__APPLE__) && !defined(_EMSCRIPTEN_VER) && defined(ULLONG_MAX) && ULLONG_MAX == 0xffffffffffffffffULL
#if !defined(_MSC_VER) && !defined(__APPLE__) && !defined(_EMSCRIPTEN_VER) && defined(ULONG_MAX) && ULONG_MAX == UINT64_MAX
template <>
struct cast <long long int> {
static __forceinline long long int to ( vec4f x ) { return v_extract_xi64(v_cast_vec4i(x)); }
Expand Down