mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 02:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added preprocessor checks for Clang on Windows

Browse Source 
- MSVC-specific code is used in some places and compiled only if _MSC_VER is set; however, Clang under Windows also defines this, which reports errors on this non-standard code if the -pedantic-errors compiler flag is set
This commit is contained in:
Razakhel 2024-02-21 22:54:44 +01:00
parent a2dd51ae4c
commit cef21ef035
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/common/TracySystem.cpp
View File

@ -110,7 +110,7 @@ struct ThreadNameData
std::atomic<ThreadNameData*>& GetThreadNameData(); std::atomic<ThreadNameData*>& GetThreadNameData();
#endif #endif
#ifdef _MSC_VER #if defined _MSC_VER && !defined __clang__
# pragma pack( push, 8 ) # pragma pack( push, 8 )
struct THREADNAME_INFO struct THREADNAME_INFO
{ {
@ -149,7 +149,7 @@ TRACY_API void SetThreadName( const char* name )
} }
else else
{ {
# if defined _MSC_VER # if defined _MSC_VER && !defined __clang__
THREADNAME_INFO info; THREADNAME_INFO info;
info.dwType = 0x1000; info.dwType = 0x1000;
info.szName = name; info.szName = name;

4
public/common/tracy_lz4.cpp
View File

@ -128,11 +128,11 @@
#endif /* _MSC_VER */ #endif /* _MSC_VER */
#ifndef LZ4_FORCE_INLINE #ifndef LZ4_FORCE_INLINE
# ifdef _MSC_VER /* Visual Studio */ # if defined (_MSC_VER) && !defined (__clang__) /* MSVC */
# define LZ4_FORCE_INLINE static __forceinline # define LZ4_FORCE_INLINE static __forceinline
# else # else
# if defined (__cplusplus) || defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */ # if defined (__cplusplus) || defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */
# ifdef __GNUC__ # if defined (__GNUC__) || defined (__clang__)
# define LZ4_FORCE_INLINE static inline __attribute__((always_inline)) # define LZ4_FORCE_INLINE static inline __attribute__((always_inline))
# else # else
# define LZ4_FORCE_INLINE static inline # define LZ4_FORCE_INLINE static inline