From 2d42265ebe54c1ba334837a71011d4ce8ae6720b Mon Sep 17 00:00:00 2001
From: Steveice10 <1269164+Steveice10@users.noreply.github.com>
Date: Sun, 20 Sep 2015 15:39:39 -0700
Subject: [PATCH] Fix Mac build.

---
 source/3ds/cbmd.cpp | 2 +-
 source/3ds/util.cpp | 2 ++
 source/cmd.cpp      | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/3ds/cbmd.cpp b/source/3ds/cbmd.cpp
index 221ec76..e7722d5 100644
--- a/source/3ds/cbmd.cpp
+++ b/source/3ds/cbmd.cpp
@@ -2,8 +2,8 @@
 
 #include "lz11.h"
 
+#include <stdlib.h>
 #include <string.h>
-#include <malloc.h>
 
 typedef struct {
     char magic[4] = {'C', 'B', 'M', 'D'};
diff --git a/source/3ds/util.cpp b/source/3ds/util.cpp
index 3a7961d..941c1a0 100644
--- a/source/3ds/util.cpp
+++ b/source/3ds/util.cpp
@@ -33,6 +33,8 @@ u16 pack_color(u8 r, u8 g, u8 b, u8 a, PixelFormat format) {
         a >>= 4;
         return r << 12 | g << 8 | b << 4 | a;
     }
+
+	return 0;
 }
 
 u8* load_image(const char* image, u32 width, u32 height) {
diff --git a/source/cmd.cpp b/source/cmd.cpp
index 1da3a07..ae278c2 100644
--- a/source/cmd.cpp
+++ b/source/cmd.cpp
@@ -9,6 +9,7 @@
 #include <string.h>
 
 #include <map>
+#include <string>
 #include <vector>
 
 u8* convert_to_cgfx(const std::string image, u32 width, u32 height, u32* size) {