diff options
author | Saracen <SaracenOne@gmail.com> | 2015-11-18 23:18:10 +0000 |
---|---|---|
committer | Saracen <SaracenOne@gmail.com> | 2015-11-18 23:18:10 +0000 |
commit | dd00452997122029dd2f74a278574d781fd2bf5f (patch) | |
tree | e36f0c62cac499500724c2929100c042972d1a5c /platform/iphone/icloud.mm | |
parent | c1d19ad258139c73e7aa81cf6e1fbd99e1bfe38b (diff) | |
parent | 94fdd01241749cb7a575ed5f9fa4c7bbb286901a (diff) |
Merge branch 'master' of https://github.com/okamstudio/godot into shadow_color
Conflicts:
drivers/gles2/shader_compiler_gles2.cpp
Diffstat (limited to 'platform/iphone/icloud.mm')
-rw-r--r-- | platform/iphone/icloud.mm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/platform/iphone/icloud.mm b/platform/iphone/icloud.mm index 2dc2f7d9c1..518385992d 100644 --- a/platform/iphone/icloud.mm +++ b/platform/iphone/icloud.mm @@ -30,10 +30,16 @@ #include "icloud.h" +#ifndef __IPHONE_9_0 extern "C" { +#endif + #import <Foundation/Foundation.h> #import "app_delegate.h" + +#ifndef __IPHONE_9_0 }; +#endif ICloud* ICloud::instance = NULL; |