Skip to content

Only use the __CWCC__ macro to test for cwcc #295

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
em-eight merged 1 commit into from
Jun 5, 2025
Merged

Only use the __CWCC__ macro to test for cwcc #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion include/macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#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__)
#if defined(__CWCC__) && !defined(__INTELLISENSE__)
#define AT_ADDRESS(addr) : (addr)
#else
#define AT_ADDRESS(addr)
Expand Down
2 changes: 1 addition & 1 deletion lib/gamespy/gt2/gt2Utility.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion lib/gamespy/qr2/qr2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion lib/gamespy/qr2/qr2regkeys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/runtime/__ppc_eabi_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern void __OSCacheInit(void);

__declspec(section ".init") asm void __init_hardware() {
// clang-format off
#ifdef __MWERKS__
#ifdef __CWCC__
nofralloc;
mfmsr r0;
ori r0, r0, 0x2000;
Expand All @@ -30,7 +30,7 @@ __declspec(section ".init") asm void __init_hardware() {

__declspec(section ".init") asm void __flush_cache() {
// clang-format off
#ifdef __MWERKS__
#ifdef __CWCC__
nofralloc;
lis r5, 0xffff;
ori r5, r5, 0xfff1;
Expand Down
8 changes: 4 additions & 4 deletions lib/runtime/__start.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ static u32 __OSPADButton AT_ADDRESS(0x800030e4);
// PAL: 0x80006068..0x80006090
__declspec(section ".init") asm void __check_pad3() {
// clang-format off
#ifdef __MWERKS__
#ifdef __CWCC__
nofralloc;
lis r3, __OSPADButton@ha;
lhz r0, __OSPADButton@l(r3);
Expand Down Expand Up @@ -49,7 +49,7 @@ __declspec(section ".init") u8 __get_debug_bba() { return __debug_bba; }
// PAL: 0x800060a4..0x80006210
__declspec(section ".init") asm void __start() {
// clang-format off
#ifdef __MWERKS__
#ifdef __CWCC__
nofralloc;
bl __init_registers;
bl __init_hardware;
Expand Down Expand Up @@ -157,7 +157,7 @@ __declspec(section ".init") asm void __start() {
}

__declspec(section ".init") asm void __init_registers(void) {
#ifdef __MWERKS__
#ifdef __CWCC__
li r0, 0x0;
li r3, 0x0;
li r4, 0x0;
Expand Down Expand Up @@ -201,7 +201,7 @@ __declspec(section ".init") asm void __init_registers(void) {
// PAL: 0x800062a0..0x80006348
__declspec(section ".init") asm void __init_data() {
// clang-format off
#ifdef __MWERKS__
#ifdef __CWCC__
nofralloc;
stwu r1, -0x20(r1);
mflr r0;
Expand Down
2 changes: 1 addition & 1 deletion lib/runtime/eabi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#ifndef __INTELLISENSE__
#ifdef __CWCC__

// PAL: 0x8002156C
extern void _savegpr_14(void);
Expand Down