From 2f72afca653090918a392bf01489889a60a2d622 Mon Sep 17 00:00:00 2001
From: bkaradzic <branimirkaradzic@gmail.com>
Date: Wed, 7 Aug 2013 22:50:01 -0700
Subject: [PATCH] Fixed iOS and OSX builds.

---
 examples/common/entry/entry_ios.mm | 11 +++--------
 examples/common/entry/entry_osx.mm | 13 +++++--------
 examples/common/entry/input.h      |  2 +-
 include/bgfxplatform.h             |  3 ---
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/examples/common/entry/entry_ios.mm b/examples/common/entry/entry_ios.mm
index 464863faf..74c26754d 100644
--- a/examples/common/entry/entry_ios.mm
+++ b/examples/common/entry/entry_ios.mm
@@ -3,7 +3,7 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#include <bx/bx.h>
+#include "entry.h"
 
 #if BX_PLATFORM_IOS
 
@@ -11,15 +11,10 @@
 #import <UIKit/UIKit.h>
 #import <QuartzCore/CAEAGLLayer.h>
 
-#include <bgfxplatform.h>
+#include "entry_p.h"
 #include <bx/uint32_t.h>
 #include <bx/thread.h>
 
-#include "entry_p.h"
-#include "dbg.h"
-
-extern int _main_(int _argc, char** _argv);
-
 namespace bgfx
 {
 	void renderFrame();
@@ -64,7 +59,7 @@ namespace entry
 	int32_t MainThreadEntry::threadFunc(void* _userData)
 	{
 		MainThreadEntry* self = (MainThreadEntry*)_userData;
-		int32_t result = _main_(self->m_argc, self->m_argv);
+		int32_t result = main(self->m_argc, self->m_argv);
 		return result;
 	}
 
diff --git a/examples/common/entry/entry_osx.mm b/examples/common/entry/entry_osx.mm
index 11da22aeb..554dc7181 100644
--- a/examples/common/entry/entry_osx.mm
+++ b/examples/common/entry/entry_osx.mm
@@ -3,22 +3,19 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#include <bx/bx.h>
+#include "entry.h"
 
 #if BX_PLATFORM_OSX
 
-#include <bgfxplatform.h>
+#import <Cocoa/Cocoa.h>
+
+#include "entry_p.h"
 #include <bx/uint32_t.h>
 #include <bx/thread.h>
 
-#include "entry_p.h"
-#include "dbg.h"
-
 #define DEFAULT_WIDTH 1280
 #define DEFAULT_HEIGHT 720
 
-extern int _main_(int _argc, char** _argv);
-
 @interface AppDelegate : NSObject<NSApplicationDelegate>
 {
 	bool terminated;
@@ -136,7 +133,7 @@ namespace entry
 		static int32_t threadFunc(void* _userData)
 		{
 			MainThreadEntry* self = (MainThreadEntry*)_userData;
-			return _main_(self->m_argc, self->m_argv);
+			return main(self->m_argc, self->m_argv);
 		}
 	};
 
diff --git a/examples/common/entry/input.h b/examples/common/entry/input.h
index 9b2c956c5..69103126a 100644
--- a/examples/common/entry/input.h
+++ b/examples/common/entry/input.h
@@ -20,7 +20,7 @@ struct InputBinding
 	const void* m_userData;
 };
 
-#define INPUT_BINDING_END { entry::Key::None, entry::Modifier::None, NULL, NULL }
+#define INPUT_BINDING_END { entry::Key::None, entry::Modifier::None, 0, NULL, NULL }
 
 ///
 void inputAddBindings(const char* _name, const InputBinding* _bindings);
diff --git a/include/bgfxplatform.h b/include/bgfxplatform.h
index 3ac8567c4..a25f54783 100755
--- a/include/bgfxplatform.h
+++ b/include/bgfxplatform.h
@@ -45,9 +45,6 @@ namespace bgfx
 } // namespace bgfx
 
 #elif BX_PLATFORM_OSX
-#	include <Cocoa/Cocoa.h>
-#	include <stdlib.h>
-
 namespace bgfx
 {
 	void osxSetNSWindow(void* _window);