From 45cd54bcd11d9b1fb62d986328917ca5cebf9b17 Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Sat, 10 Nov 2012 15:13:41 +0000 Subject: [PATCH] OSX/ndof: rollback 52072, test showed we need individually weak functions -> todo: solve the clang link issue other way --- intern/ghost/intern/GHOST_NDOFManagerCocoa.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm index 454e601ea18..d29dd4dd3e8 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(); // (testing whole framework weak) __attribute__((weak_import)); + extern OSErr InstallConnexionHandlers() __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(); // (testing whole framework weak) __attribute__((weak_import)); + extern OSErr SetConnexionClientButtonMask() __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;