encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 2694 - configure bug __has_feature macro not detected 

skaller

using gcc 4.2 (the default) on Mac OSX 10.6.8

 CC     build/SDL_dynapi.lo
In file included from /Users/johnskaller/SDL/src/dynapi/SDL_dynapi.c:31:
include/SDL_syswm.h:211:39: error: missing binary operator before token "("

The fault appears to be here:

#if defined(__OBJC__) && __has_feature(objc_arc)

that the __has_feature macro is not supported by gcc 4.2.

The code works fine with my clang 3.3svn.
This commit is contained in:
Sam Lantinga 2014-08-19 21:17:21 -07:00
parent 04f7422552
commit eba65c66a3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/SDL_syswm.h
View File

@ -208,7 +208,7 @@ struct SDL_SysWMinfo
#if defined(SDL_VIDEO_DRIVER_COCOA) #if defined(SDL_VIDEO_DRIVER_COCOA)
struct struct
{ {
#if defined(__OBJC__) && __has_feature(objc_arc) #if defined(__OBJC__) && defined(__clang__) && __has_feature(objc_arc)
NSWindow __unsafe_unretained *window; /* The Cocoa window */ NSWindow __unsafe_unretained *window; /* The Cocoa window */
#else #else
NSWindow *window; /* The Cocoa window */ NSWindow *window; /* The Cocoa window */
@ -218,7 +218,7 @@ struct SDL_SysWMinfo
#if defined(SDL_VIDEO_DRIVER_UIKIT) #if defined(SDL_VIDEO_DRIVER_UIKIT)
struct struct
{ {
#if defined(__OBJC__) && __has_feature(objc_arc) #if defined(__OBJC__) && defined(__clang__) && __has_feature(objc_arc)
UIWindow __unsafe_unretained *window; /* The UIKit window */ UIWindow __unsafe_unretained *window; /* The UIKit window */
#else #else
UIWindow *window; /* The UIKit window */ UIWindow *window; /* The UIKit window */