suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjust use of TARGET_OS_IPHONE in C preprocessing

Browse Source 
Some Mac headers `#define` it as 0, so depend on its value instead
of its definedness.
This commit is contained in:
Matthew Flatt 2015-02-23 08:27:23 -07:00
parent 80e4894597
commit c5e9f42cee
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
racket/src/configure vendored
View File

@ -3258,8 +3258,8 @@ if test "${enable_ios}" != "" ; then
;;
esac
IOS_PHONE_VERS="6.0"
PREFLAGS="$PREFLAGS -DTARGET_OS_IPHONE"
CPPFLAGS="$CPPFLAGS -DTARGET_OS_IPHONE"
PREFLAGS="$PREFLAGS -DTARGET_OS_IPHONE=1"
CPPFLAGS="$CPPFLAGS -DTARGET_OS_IPHONE=1"
PREFLAGS="$PREFLAGS -arch ${IOS_ARCH} -isysroot ${ios_sdk} -miphoneos-version-min=${IOS_PHONE_VERS}"
CPPFLAGS="$CPPFLAGS -arch ${IOS_ARCH} -isysroot ${ios_sdk} -miphoneos-version-min=${IOS_PHONE_VERS}"
LDFLAGS="$LDFLAGS -arch ${IOS_ARCH} -isysroot ${ios_sdk} -miphoneos-version-min=${IOS_PHONE_VERS} -liconv"

4
racket/src/racket/configure.ac
View File

@ -530,8 +530,8 @@ if test "${enable_ios}" != "" ; then
;;
esac
IOS_PHONE_VERS="6.0"
PREFLAGS="$PREFLAGS -DTARGET_OS_IPHONE"
CPPFLAGS="$CPPFLAGS -DTARGET_OS_IPHONE"
PREFLAGS="$PREFLAGS -DTARGET_OS_IPHONE=1"
CPPFLAGS="$CPPFLAGS -DTARGET_OS_IPHONE=1"
PREFLAGS="$PREFLAGS -arch ${IOS_ARCH} -isysroot ${ios_sdk} -miphoneos-version-min=${IOS_PHONE_VERS}"
CPPFLAGS="$CPPFLAGS -arch ${IOS_ARCH} -isysroot ${ios_sdk} -miphoneos-version-min=${IOS_PHONE_VERS}"
LDFLAGS="$LDFLAGS -arch ${IOS_ARCH} -isysroot ${ios_sdk} -miphoneos-version-min=${IOS_PHONE_VERS} -liconv"

2
racket/src/racket/sconfig.h
View File

@ -807,7 +807,7 @@
# if defined(XONX)
# define SPLS_MAC "darwin"
# elif defined(TARGET_OS_IPHONE)
# elif TARGET_OS_IPHONE
# define SPLS_MAC "ios"
# else
# define SPLS_MAC "macosx"

2
racket/src/racket/src/lightning/arm/core.h
View File

@ -53,7 +53,7 @@ jit_v_order[JIT_V_NUM] = {
#define jit_no_set_flags() jit_flags.no_set_flags
#ifdef TARGET_OS_IPHONE
#if TARGET_OS_IPHONE
# define USE_SEPARATE_DIV_AND_MOD
#endif

2
racket/src/racket/src/lightning/arm/funcs.h
View File

@ -42,7 +42,7 @@
#define jit_notify_freed_code() /* empty */
#ifdef TARGET_OS_IPHONE
#if TARGET_OS_IPHONE
void sys_icache_invalidate(void *start, size_t len);
# define CLEAR_ICACHE(s, e) sys_icache_invalidate(s, ((char *)e) - ((char *)s));
#else

2
racket/src/racket/src/string.c
View File

@ -2157,7 +2157,7 @@ int scheme_any_string_has_null(Scheme_Object *o)
/* Environment Variables */
/***********************************************************************/
#if defined(OS_X) && !defined(TARGET_OS_IPHONE)
#if defined(OS_X) && !TARGET_OS_IPHONE
# include <crt_externs.h>
# define GET_ENVIRON_ARRAY *_NSGetEnviron()
#endif