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 #include -#elif defined(BLACKBERRY) -#include -#include #elif defined(USING_GLES2) #include #include