From fc0a807d20dfc5fed06b97bf11da51759392cc90 Mon Sep 17 00:00:00 2001 From: Rcmaniac25 Date: Fri, 24 Jan 2014 10:26:52 +0000 Subject: [PATCH] Removed fg_main_blackberry.h. It wasn't needed git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1652 7f0cb862-5218-0410-a997-914c9d46530a --- CMakeLists.txt | 1 - src/blackberry/fg_main_blackberry.c | 2 +- src/blackberry/fg_main_blackberry.h | 36 ----------------------------------- 3 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 src/blackberry/fg_main_blackberry.h diff --git a/CMakeLists.txt b/CMakeLists.txt index f2dd875..527370a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,7 +146,6 @@ ELSEIF(ANDROID OR BLACKBERRY) src/blackberry/fg_internal_blackberry.h src/x11/fg_input_devices_x11.c src/blackberry/fg_main_blackberry.c - src/blackberry/fg_main_blackberry.h src/blackberry/fg_state_blackberry.c src/blackberry/fg_window_blackberry.c ) diff --git a/src/blackberry/fg_main_blackberry.c b/src/blackberry/fg_main_blackberry.c index 4c666f1..65b5954 100644 --- a/src/blackberry/fg_main_blackberry.c +++ b/src/blackberry/fg_main_blackberry.c @@ -157,7 +157,7 @@ fg_time_t fgPlatformSystemTime ( void ) * Does the magic required to relinquish the CPU until something interesting * happens. */ -void fgPlatformSleepForEvents( uint64_t msec ) +void fgPlatformSleepForEvents( fg_time_t msec ) { //XXX: Is this right? Is there a more direct way to access the context? if(bps_get_event(&fgStructure.CurrentWindow->Window.pContext.event, (int)msec) != BPS_SUCCESS) { diff --git a/src/blackberry/fg_main_blackberry.h b/src/blackberry/fg_main_blackberry.h deleted file mode 100644 index 769e23d..0000000 --- a/src/blackberry/fg_main_blackberry.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * fg_main_blackberry.h - * - * The BlackBerry-specific windows message processing methods. - * - * Copyright (C) 2013 Vincent Simonetti - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef __FG_MAIN_BLACKBERRY_H__ -#define __FG_MAIN_BLACKBERRY_H__ - -#include -#include "fg_internal.h" - -extern void fgPlatformProcessSingleEvent(void); -extern void fgPlatformSleepForEvents(uint64_t msec); -extern void fgPlatformMainLoopPreliminaryWork(void); - -#endif -- 1.7.10.4