diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-10 19:13:41 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-10 19:13:41 +0400 |
| commit | 45cd54bcd11d9b1fb62d986328917ca5cebf9b17 (patch) | |
| tree | c3982d1a0809371ab662bb96e15ec4694df5733d /intern/ghost | |
| parent | 5ddc5fbfb365a79b5ffa8ab7fbec7c4a89321e06 (diff) | |
OSX/ndof: rollback 52072, test showed we need individually weak functions -> todo: solve the clang link issue other way
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_NDOFManagerCocoa.mm | 4 |
1 files 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; |