Only use the __CWCC__ macro to test for cwcc

Author: KooShnoo

.clangd

@@ -0,0 +1,2 @@
+CompileFlags:
+  Add: [-D__CLANGD__]

include/decomp.h

@@ -25,7 +25,8 @@ typedef struct ps_f32 {
   SECTION_GARBAGE static void __garbage_ordering_hints(void)
 #define order_hint_access(var) (void)(var)
 
-#elif defined (__INTELLISENSE__)
+#elif defined (__EDITOR_CHECKING__)
+// dummy implementations for editor tooling
 
 #define sdata_ps_f32 ps_f32
 #define sdata2_ps_f32 ps_f32
@@ -35,9 +36,5 @@ typedef struct ps_f32 {
 #define SECTION_GARBAGE
 #define static_order_hints
 #define order_hint_access(var) (void)(var)
-
-#endif
-
-#ifdef __clang__
-#define __cntlzw(x) __builtin_clz(x)
+#define __cntlzw(x) (x)
 #endif

include/macros.h

@@ -24,16 +24,20 @@
 
 #define DECLTYPE(x) __decltype__(x)
 
-// https://github.com/DarkRTA/rb3/blob/235050f88a263fec0387b7c618dda76a8bb24d2c/src/sdk/RVL_SDK/revolution/os/OSUtils.h#L13-L17
-#if defined(__MWERKS__) && !defined(__INTELLISENSE__)
-#define AT_ADDRESS(addr) : (addr)
-#else
-#define AT_ADDRESS(addr)
+#if defined(__INTELLISENSE__) || defined(__CLANGD__)
+#define __EDITOR_CHECKING__
 #endif
 
-// For VSCode
-#ifdef __INTELLISENSE__
+#ifdef __CWCC__
+// codewarrior-specific syntax
+#define AT_ADDRESS(addr) : (addr)
+#elif defined(__EDITOR_CHECKING__)
+// dummy implementations for editor tooling
+#define AT_ADDRESS(addr)
 #define asm
 #define __attribute__(x)
 #define __declspec(x)
+#else
+// building with a non-codewarrior compiler is not supported yet
+#error "workarounds for codewarrior's language extensions unimplemented"
 #endif

include/rk_types.h

@@ -111,7 +111,7 @@ class NonCopyable {
 
 
 // Main static assert macro
-#if defined(__INTELLISENSE__)
+#ifdef __EDITOR_CHECKING__
   #if !__has_extension(c_static_assert)
     #error "language server lacks `_Static_assert` support"
   #endif

lib/MSL/include/math.h

@@ -25,9 +25,14 @@ inline f32 sqrtf(f32 x) { return (f32)sqrt(x); }
 f64 acos(f64);
 inline f32 acosf(f32 x) { return (f32)acos(x); }
 
-#ifdef __INTELLISENSE__
-#define __fabsf(x) x
-#define __fabs(x) x
+#ifdef __CWCC__
+// when using the codewarrior compiler, __fabs and __fabsf are builtin intrinsics.
+#elif defined(__EDITOR_CHECKING__)
+// dummy implementation for editor tooling
+#define __fabsf(x) (x)
+#define __fabs(x) (x)
+#else
+#error "attempted to compile MSL (Metrowerks Standard Library) header with non-codewarrior compiler"
 #endif
 
 f32 fabsf(f32);

lib/MSL/include/stddef.h

@@ -1,6 +1,8 @@
 #pragma once
 
-#ifdef __INTELLISENSE__
+#include "macros.h"
+
+#ifdef __EDITOR_CHECKING__
 #define offsetof(type, m) __builtin_offsetof(type,m)
 #else
 #define offsetof(type, m) ((size_t) & (((type*)0)->m))

lib/MSL/include/stdlib.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "macros.h"
+
 #ifndef SIZE_T_DEFINE
 #define SIZE_T_DEFINE
 typedef unsigned long size_t;
@@ -9,11 +11,12 @@ typedef unsigned long size_t;
 #ifdef __CWCC__
 #define abs(x) __abs(x)
 #define labs(x) __labs(x)
-#elif defined(__clang__)
-#define abs(x) __builtin_abs(x)
-#define labs(x) __builtin_labs(x)
+#elif defined(__EDITOR_CHECKING__)
+// dummy implementation for editor tooling
+#define abs(x) (x)
+#define labs(x) (x)
 #else
-#error compiler has no instrinsic abs support, please do some sit ups.
+#error "attempted to compile MSL (Metrowerks Standard Library) header with non-codewarrior compiler"
 #endif
 
 long strtol(const char* restrict nptr, char** restrict endptr, int base);

lib/gamespy/gt2/gt2Utility.c

@@ -230,7 +230,7 @@ unsigned int** gt2StringToIPs(const char* string) {
 ** INTERNAL FUNCTIONS **
 ***********************/
 
-#ifdef __MWERKS__ // CodeWarrior will warn if not prototyped
+#ifdef __CWCC__ // CodeWarrior will warn if not prototyped
 void gti2MessageCheck(const GT2Byte** message, int* len);
 #endif
 

lib/gamespy/qr2/qr2.c

@@ -11,7 +11,7 @@ INCLUDES
 extern "C" {
 #endif
 
-#ifdef __MWERKS__ // Codewarrior requires function prototypes
+#ifdef __CWCC__ // Codewarrior requires function prototypes
 qr2_error_t qr2_initW(/*[out]*/ qr2_t* qrec, const unsigned short* ip,
                       int baseport, const unsigned short* gamename,
                       const unsigned short* secret_key, int ispublic,

lib/gamespy/qr2/qr2regkeys.c

@@ -4,7 +4,7 @@
 #include "../common/gsDebug.h"
 #include "../common/gsStringUtil.h"
 
-#ifdef __MWERKS__ // CodeWarrior requires prototypes
+#ifdef __CWCC__ // CodeWarrior requires prototypes
 void qr2_register_keyW(int keyid, const unsigned short* key);
 void qr2_register_keyA(int keyid, const char* key);
 #endif