From 9d12813282328ad2b4bb6b6d5c40a89b69dc4ff6 Mon Sep 17 00:00:00 2001
From: Nicholas Estelami <NEstelami@users.noreply.github.com>
Date: Sun, 31 Jul 2022 14:50:28 -0400
Subject: [PATCH] Fixed merge/rebase issues

---
 libultraship/libultraship/color.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libultraship/libultraship/color.h b/libultraship/libultraship/color.h
index 3e39389be..44ba465c2 100644
--- a/libultraship/libultraship/color.h
+++ b/libultraship/libultraship/color.h
@@ -1,8 +1,14 @@
 #ifndef COLOR_H
 #define COLOR_H
 
+#include <stdint.h>
 #include "endianness.h"
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 typedef struct {
     uint8_t r, g, b;
 } Color_RGB8;
@@ -15,9 +21,9 @@ typedef struct {
 typedef union {
     struct {
 #ifdef IS_BIGENDIAN
-        u8 r, g, b, a;
+        uint8_t r, g, b, a;
 #else
-        u8 a, b, g, r;
+        uint8_t a, b, g, r;
 #endif
     };
     uint32_t rgba;