Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2012-11-10 17:53:02 +0400
committerJens Verwiebe <info@jensverwiebe.de>2012-11-10 17:53:02 +0400
commit472b3d47f90f22144de2466d11671efa6c23c7e8 (patch)
treed5f1197ad372e386e53771473e95f32b82004751
parentcb2f91b9d2660ddf1c8b730c7b1ee2b2e1170a0b (diff)
OSX/ndof: test link whole framework weak rather than single functions to fix clang compile issue
-rw-r--r--intern/ghost/intern/GHOST_NDOFManagerCocoa.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
index d29dd4dd3e8..454e601ea18 100644
--- a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
+++ b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
@@ -168,7 +168,7 @@ GHOST_NDOFManagerCocoa::~GHOST_NDOFManagerCocoa()
extern "C" {
bool GHOST_NDOFManagerCocoa::available()
{
- extern OSErr InstallConnexionHandlers() __attribute__((weak_import));
+ extern OSErr InstallConnexionHandlers(); // (testing whole framework weak) __attribute__((weak_import));
// Make the linker happy for the framework check (see link below for more info)
// http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/WeakLinking.html
return InstallConnexionHandlers != NULL;
@@ -177,7 +177,7 @@ extern "C" {
bool GHOST_NDOFManagerCocoa::oldDRV()
{
- extern OSErr SetConnexionClientButtonMask() __attribute__((weak_import));
+ extern OSErr SetConnexionClientButtonMask(); // (testing whole framework weak) __attribute__((weak_import));
// Make the linker happy for the framework check (see link below for more info)
// http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/WeakLinking.html
return SetConnexionClientButtonMask != NULL;