ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(iOS/Apple) Include <AvailabilityMacros.h instead of #import <Availability>

This commit is contained in:
Twinaphex 2015-03-30 17:57:54 +02:00
parent 4550019b2c
commit 17d6a940c0
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apple/common/GameController/GameController.h
View File

@ -6,7 +6,7 @@
// //
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <Availability.h> #include <AvailabilityMacros.h>
#ifdef __cplusplus #ifdef __cplusplus
#define GAMECONTROLLER_EXTERN extern "C" __attribute__((visibility ("default"))) #define GAMECONTROLLER_EXTERN extern "C" __attribute__((visibility ("default")))
@ -32,4 +32,4 @@
#import "GCExtendedGamepad.h" #import "GCExtendedGamepad.h"
#import "GCExtendedGamepadSnapshot.h" #import "GCExtendedGamepadSnapshot.h"
#import "GCController.h" #import "GCController.h"

2
apple/common/apple_gamecontroller.m
View File

@ -13,7 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Availability.h> #include <AvailabilityMacros.h>
#include "RetroArch_Apple.h" #include "RetroArch_Apple.h"
#import "GameController/GameController.h" #import "GameController/GameController.h"
#include "apple_gamecontroller.h" #include "apple_gamecontroller.h"

6
libretro-common/include/compat/apple_compat.h
View File

@ -20,9 +20,11 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifdef IOS #ifdef __APPLE__
#import <Availability.h> #include <AvailabilityMacros.h>
#endif
#ifdef IOS
#ifndef __IPHONE_5_0 #ifndef __IPHONE_5_0
#warning "This project uses features only available in iOS SDK 5.0 and later." #warning "This project uses features only available in iOS SDK 5.0 and later."
#endif #endif

2
menu/drivers/xmb.c
View File

@ -1257,6 +1257,8 @@ static void xmb_frame(void)
if (!menu) if (!menu)
return; return;
(void)font_driver;
xmb = (xmb_handle_t*)menu->userdata; xmb = (xmb_handle_t*)menu->userdata;