diff options
| -rw-r--r-- | extern/bFTGL/src/FTVectoriser.cpp | 8 | ||||
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/extern/bFTGL/src/FTVectoriser.cpp b/extern/bFTGL/src/FTVectoriser.cpp index bb133d025b4..82dcb0c0f51 100644 --- a/extern/bFTGL/src/FTVectoriser.cpp +++ b/extern/bFTGL/src/FTVectoriser.cpp @@ -5,8 +5,12 @@ #define CALLBACK #endif -#ifdef __APPLE_CC__ - typedef GLvoid (*GLUTesselatorFunction)(...); +#if defined(__APPLE_CC__) + #if __APPLE_CC__ >= 5465 + typedef GLvoid (*GLUTesselatorFunction)(); + #else + typedef GLvoid (*GLUTesselatorFunction)(...); + #endif #elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__) typedef GLvoid (*GLUTesselatorFunction)(); #elif defined ( WIN32) diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp index c8ed2dd6960..26b00f02e7d 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp @@ -108,7 +108,7 @@ static OSStatus bglInitEntryPoints (void) // Frameworks directory/folder err = FindFolder (kSystemDomain, kFrameworksFolderType, false, - &fileRefParam.ioVRefNum, &fileRefParam.ioDirID); + &fileRefParam.ioVRefNum, (SInt32*)&fileRefParam.ioDirID); if (noErr != err) { DebugStr ((unsigned char *)"\pCould not find frameworks folder"); return err; |