From da151300f74b13c8046e86cebf23112237627e1b Mon Sep 17 00:00:00 2001
From: Roman971 <romanlasnier@hotmail.com>
Date: Mon, 23 Mar 2020 23:15:45 +0100
Subject: [PATCH] Run gcc checks with NON_MATCHING defined

---
 makefile            | 8 ++------
 src/code/gfxprint.c | 2 +-
 src/code/z_sample.c | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/makefile b/makefile
index 12d794b44d..55ba473563 100644
--- a/makefile
+++ b/makefile
@@ -26,8 +26,8 @@ OBJDUMP    := $(MIPS_BINUTILS_PREFIX)objdump
 CC         := $(QEMU_IRIX) -L tools/ido7.1_compiler tools/ido7.1_compiler/usr/bin/cc
 CC_OLD     := $(QEMU_IRIX) -L tools/ido5.3_compiler tools/ido5.3_compiler/usr/bin/cc
 
-# Check code syntax with host compiler (TODO: define NON_MATCHING because the non-matching code is utterly broken)
-CC_CHECK   := gcc -fno-builtin -fsyntax-only -fsigned-char -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -D _LANGUAGE_C -I include -include stdarg.h
+# Check code syntax with host compiler
+CC_CHECK   := gcc -fno-builtin -fsyntax-only -fsigned-char -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -D _LANGUAGE_C -D NON_MATCHING -I include -include stdarg.h
 
 CPP        := cpp
 MKLDSCRIPT := tools/mkldscript
@@ -157,10 +157,6 @@ build/assets/%.o: assets/%.c
 #	$(CC_CHECK) $^
 	$(OBJCOPY) -O binary $@ $@.bin
 
-#build/src/boot/%.o: src/boot/%.c
-#	$(CC) -c $(CFLAGS) $(OPTIMIZATION) -o $@ $^
-#	@$(OBJDUMP) -d $@ > $(@:.o=.s)
-
 build/src/overlays/%.o: src/overlays/%.c
 	$(CC) -c $(CFLAGS) $(OPTIMIZATION) -o $@ $^
 	$(CC_CHECK) $^
diff --git a/src/code/gfxprint.c b/src/code/gfxprint.c
index fbcca3cee5..cc2f21e697 100644
--- a/src/code/gfxprint.c
+++ b/src/code/gfxprint.c
@@ -223,7 +223,7 @@ void GfxPrint_SetBasePosPx(GfxPrint* this, s32 x, s32 y) {
 
 #ifdef NON_MATCHING
 // regalloc and ordering differences
-void GfxPrint_PrintCharImpl(GfxPrint* this, char c) {
+void GfxPrint_PrintCharImpl(GfxPrint* this, u8 c) {
     if (this->flag & GFXPRINT_UPDATE_MODE) {
         this->flag &= ~GFXPRINT_UPDATE_MODE;
 
diff --git a/src/code/z_sample.c b/src/code/z_sample.c
index cbd9347010..2f4f3fc6fb 100644
--- a/src/code/z_sample.c
+++ b/src/code/z_sample.c
@@ -20,8 +20,8 @@ void Sample_Draw(SampleContext* this) {
 
     func_800C6AC4(gfxArr, gfxCtx, "../z_sample.c", 62);
 
-    gSPSegment(gfxCtx->polyOpa.p++, 0, NULL;
-    gSPSegment(gfxCtx->polyOpa.p++, 1, this->staticSegment);
+    gSPSegment(gfxCtx->polyOpa.p++, 0x00, NULL);
+    gSPSegment(gfxCtx->polyOpa.p++, 0x01, this->staticSegment);
 
     func_80095248(gfxCtx, 0, 0, 0);