From 79880f85673d5db4077a14c6d26ca377ff54fad9 Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Mon, 2 Jun 2014 12:01:16 +1000
Subject: [PATCH] Fix all warnings/errors on Blackberry. Revert GLES3 headers
 as they didn't include nvidia extensions.

---
 base/BlackberryDisplay.cpp | 2 +-
 base/BlackberryMain.h      | 2 +-
 gfx/gl_common.h            | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/base/BlackberryDisplay.cpp b/base/BlackberryDisplay.cpp
index 91045614d7..e4bbdcaf6d 100644
--- a/base/BlackberryDisplay.cpp
+++ b/base/BlackberryDisplay.cpp
@@ -5,7 +5,7 @@
 // Blackberry implementation of the framework.
 #include "BlackberryMain.h"
 
-char* BlackberryMain::displayTypeString(int type)
+const char* BlackberryMain::displayTypeString(int type)
 {
 	switch (type)
 	{
diff --git a/base/BlackberryMain.h b/base/BlackberryMain.h
index 78eb164c8f..fe4af41d4c 100644
--- a/base/BlackberryMain.h
+++ b/base/BlackberryMain.h
@@ -64,7 +64,7 @@ private:
 
 	void  handleInput(screen_event_t screen_event);
 
-	char* displayTypeString(int type);
+	const char* displayTypeString(int type);
 	void  startDisplays();
 	void* startDisplay(int idx);
 	void  realiseDisplay(int idx);
diff --git a/gfx/gl_common.h b/gfx/gl_common.h
index c44678750d..856c4e3248 100644
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@@ -3,9 +3,6 @@
 #ifdef IOS
 #include <OpenGLES/ES3/gl.h>
 #include <OpenGLES/ES3/glext.h>
-#elif defined(BLACKBERRY)
-#include <GLES3/gl3.h>
-#include <GLES3/gl3ext.h>
 #elif defined(USING_GLES2)
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>