diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-12-15 09:21:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-15 09:21:35 +0100 |
commit | e75da0a4402e53373c66f9bf99e8e8ba6f0ee5b2 (patch) | |
tree | bf1eac165a8c2e6c488a0bbdc1724c666a38e168 /thirdparty/thekla_atlas/nvcore/DefsGnucWin32.h | |
parent | c0beab6c5b85d4327b6da4870cd686cbb9920b04 (diff) | |
parent | f55162ac1d8457a806b61880dc9ce424ec47fefb (diff) |
Merge pull request #14690 from bruvzg/thekla-mingw-build-fix
Fixes thekla atlas mingw-w64 build.
Diffstat (limited to 'thirdparty/thekla_atlas/nvcore/DefsGnucWin32.h')
-rw-r--r-- | thirdparty/thekla_atlas/nvcore/DefsGnucWin32.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/thirdparty/thekla_atlas/nvcore/DefsGnucWin32.h b/thirdparty/thekla_atlas/nvcore/DefsGnucWin32.h index 4f97b90f3a..e1c8d6e4f8 100644 --- a/thirdparty/thekla_atlas/nvcore/DefsGnucWin32.h +++ b/thirdparty/thekla_atlas/nvcore/DefsGnucWin32.h @@ -19,7 +19,9 @@ #endif #define NV_FASTCALL __attribute__((fastcall)) +// -- GODOT start - #define NV_FORCEINLINE __attribute__((always_inline)) inline +// -- GODOT end - #define NV_DEPRECATED __attribute__((deprecated)) #if __GNUC__ > 2 |