From b52cb62c7950c6df7847aa04981a607504745c21 Mon Sep 17 00:00:00 2001
From: Galleon <galleondragon@gmail.com>
Date: Sat, 7 Mar 2015 06:31:54 -0800
Subject: [PATCH] MacOSX fixes

---
 internal/c/common.cpp | 6 +++++-
 internal/c/libqb.cpp  | 7 ++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/internal/c/common.cpp b/internal/c/common.cpp
index ad34f364f..ad90da999 100644
--- a/internal/c/common.cpp
+++ b/internal/c/common.cpp
@@ -79,7 +79,11 @@
 
 //common includes
 #include <stdio.h>
-#include <math.h>
+#ifdef QB64_MACOSX
+	#include <cmath>
+#else
+	#include <math.h>
+#endif
 #include <time.h>
 #include <iostream>
 #include <fstream>
diff --git a/internal/c/libqb.cpp b/internal/c/libqb.cpp
index 64708da9f..cc8c89b76 100644
--- a/internal/c/libqb.cpp
+++ b/internal/c/libqb.cpp
@@ -26,12 +26,12 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
-
 Display *X11_display=NULL;
 Window X11_window;
+#endif
+
 int32 x11_locked=0;
 int32 x11_lock_request=0;
-
 void x11_lock(){
   x11_lock_request=1; while (x11_locked==0) Sleep(1);
 }
@@ -39,7 +39,7 @@ void x11_unlock(){
   x11_locked=0;
 }
 
-#endif
+
 
 /*
 Logging for QB64 developers (when an alert() just isn't enough)
@@ -314,6 +314,7 @@ MUTEX* new_mutex(){
   #ifdef QB64_LINUX
     pthread_mutex_init(&m->handle, NULL);
   #endif
+  return m;
 }
 
 void free_mutex(MUTEX *mutex){