From be993ad4222fc9fc28080a8ba8f962da82c7b1f4 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Tue, 3 Aug 2021 18:27:19 +0200
Subject: [PATCH] Merge illwieckz their portability fix

---
 libs/picomodel/picointernal.h | 4 ++++
 libs/picomodel/pm_fm.h        | 4 ----
 libs/picomodel/pm_iqm.c       | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libs/picomodel/picointernal.h b/libs/picomodel/picointernal.h
index 28e6e0ef..ac6499c6 100644
--- a/libs/picomodel/picointernal.h
+++ b/libs/picomodel/picointernal.h
@@ -77,6 +77,10 @@ extern "C"
 #define PICO_IOERR  2
 
 /* types */
+#ifndef byte
+	typedef unsigned char byte;
+#endif
+
 typedef struct picoParser_s
 {
 	const char *buffer;
diff --git a/libs/picomodel/pm_fm.h b/libs/picomodel/pm_fm.h
index 6fa317ca..8ffcc405 100644
--- a/libs/picomodel/pm_fm.h
+++ b/libs/picomodel/pm_fm.h
@@ -76,10 +76,6 @@
 #define INFO_HEIGHT 5
 #define INFO_Y ( SKINPAGE_HEIGHT - INFO_HEIGHT )
 
-#ifndef byte
-	#define byte unsigned char
-#endif
-
 
 //
 //	Generic header on every chunk
diff --git a/libs/picomodel/pm_iqm.c b/libs/picomodel/pm_iqm.c
index 1bb9d1e9..739cbeff 100644
--- a/libs/picomodel/pm_iqm.c
+++ b/libs/picomodel/pm_iqm.c
@@ -34,7 +34,6 @@
 
 /* dependencies */
 #include "picointernal.h"
-#include "bytebool.h"
 
 extern const picoModule_t picoModuleIQM;