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:
authorCampbell Barton <ideasman42@gmail.com>2013-10-08 15:27:39 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-10-08 15:27:39 +0400
commit916f793a7046c1447d217b4360647a7812dde48e (patch)
treeafe13a8596f7d42fec9a65166df698b5a6198520 /intern/ghost
parenteb51bfcfca4c963afcc7788882d383a598bf16b2 (diff)
code cleanup: strange formatting.
Diffstat (limited to 'intern/ghost')
-rw-r--r--intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c71
1 files changed, 41 insertions, 30 deletions
diff --git a/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c b/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
index 2efa0e6d5e8..9df9a56f8b8 100644
--- a/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
+++ b/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
@@ -30,7 +30,7 @@
/* It is to be noted that these implementations are linked in as
* 'extern "C"' calls from GHOST_NDOFManagerCocoa.
-
+
* This is done in order to
* preserve weak linking capability (which as of clang-3.3 and xcode5
* breaks weak linking when there is name mangling of c++ libraries.)
@@ -42,42 +42,53 @@
OSErr GHOST_NDOFManager3Dconnexion_available(void)
{
- // extern unsigned int 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 != 0;
- // this means that the driver is installed and dynamically linked to blender
+ // extern unsigned int 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 != 0;
+ // this means that the driver is installed and dynamically linked to blender
}
OSErr GHOST_NDOFManager3Dconnexion_oldDRV()
{
- //extern unsigned int 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 != 0;
- // this means that the driver has this symbol
+ //extern unsigned int 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 != 0;
+ // this means that the driver has this symbol
+}
+
+UInt16 GHOST_NDOFManager3Dconnexion_RegisterConnexionClient(UInt32 signature, UInt8 *name, UInt16 mode, UInt32 mask)
+{
+ return RegisterConnexionClient(signature, name, mode, mask);
+}
+
+void GHOST_NDOFManager3Dconnexion_SetConnexionClientButtonMask(UInt16 clientID, UInt32 buttonMask)
+{
+ return SetConnexionClientButtonMask( clientID, buttonMask);
+}
+
+void GHOST_NDOFManager3Dconnexion_UnregisterConnexionClient(UInt16 clientID)
+{
+ return UnregisterConnexionClient( clientID);
+}
+
+OSErr GHOST_NDOFManager3Dconnexion_InstallConnexionHandlers(
+ ConnexionMessageHandlerProc messageHandler,
+ ConnexionAddedHandlerProc addedHandler,
+ ConnexionRemovedHandlerProc removedHandler)
+{
+ return InstallConnexionHandlers( messageHandler, addedHandler, removedHandler);
}
-UInt16 GHOST_NDOFManager3Dconnexion_RegisterConnexionClient (UInt32 signature, UInt8 *name, UInt16 mode, UInt32 mask) {
- return RegisterConnexionClient(signature, name, mode, mask);
-};
-void GHOST_NDOFManager3Dconnexion_SetConnexionClientButtonMask (UInt16 clientID, UInt32 buttonMask){
- return SetConnexionClientButtonMask( clientID, buttonMask);
-};
-void GHOST_NDOFManager3Dconnexion_UnregisterConnexionClient (UInt16 clientID){
- return UnregisterConnexionClient( clientID);
-};
-OSErr GHOST_NDOFManager3Dconnexion_InstallConnexionHandlers (ConnexionMessageHandlerProc messageHandler, ConnexionAddedHandlerProc addedHandler, ConnexionRemovedHandlerProc removedHandler){
- return InstallConnexionHandlers( messageHandler, addedHandler, removedHandler);
-
-
-};
-void GHOST_NDOFManager3Dconnexion_CleanupConnexionHandlers (void){
- return CleanupConnexionHandlers();
-};
-OSErr GHOST_NDOFManager3Dconnexion_ConnexionControl(UInt32 message, SInt32 param, SInt32 *result){
-return ConnexionControl( message, param, result);
+void GHOST_NDOFManager3Dconnexion_CleanupConnexionHandlers(void)
+{
+ return CleanupConnexionHandlers();
}
+OSErr GHOST_NDOFManager3Dconnexion_ConnexionControl(UInt32 message, SInt32 param, SInt32 *result)
+{
+ return ConnexionControl( message, param, result);
+}
#endif // WITH_INPUT_NDOF