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

Remove internal conditionals to use defined flag

This commit is contained in:
TwistedUmbrella 2015-08-20 17:21:11 -04:00
parent c17486a0ef
commit e138cca4b9
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/deps/libpng/pngpriv.h
View File

@ -48,7 +48,7 @@
* <fp.h> if possible. * <fp.h> if possible.
*/ */
# if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__) # if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
# if TARGET_OS_IPHONE # if TARGET_IPHONE
# include "fp.h" # include "fp.h"
# else # else
# include <fp.h> # include <fp.h>

4
core/linux/common.cpp
View File

@ -18,7 +18,7 @@
#include <sys/param.h> #include <sys/param.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/time.h> #include <sys/time.h>
#if !defined(_ANDROID) && !defined(TARGET_OS_IPHONE) && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN) && !defined(TARGET_OSX) #if !defined(_ANDROID) && !defined(TARGET_IPHONE) && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN) && !defined(TARGET_OSX)
#include <sys/personality.h> #include <sys/personality.h>
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
@ -263,7 +263,7 @@ double os_GetSeconds()
return a.tv_sec-tvs_base+a.tv_usec/1000000.0; return a.tv_sec-tvs_base+a.tv_usec/1000000.0;
} }
#if TARGET_OS_IPHONE #if TARGET_IPHONE
void os_DebugBreak() { void os_DebugBreak() {
__asm__("trap"); __asm__("trap");
} }

1
shell/apple/emulator-ios/emulator/reicast-ios-Prefix.pch
View File

@ -9,7 +9,6 @@
#define reicast_ios_reicast_ios_Prefix_pch #define reicast_ios_reicast_ios_Prefix_pch
#import <Availability.h> #import <Availability.h>
#import <TargetConditionals.h>
#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."