[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25652] trunk/blender: Fix some build warnings
Damien Plisson
damien.plisson at yahoo.fr
Fri Jan 1 16:48:15 CET 2010
Revision: 25652
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25652
Author: damien78
Date: 2010-01-01 16:48:14 +0100 (Fri, 01 Jan 2010)
Log Message:
-----------
Fix some build warnings
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
trunk/blender/source/blender/blenkernel/BKE_utildefines.h
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-01-01 15:05:31 UTC (rev 25651)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-01-01 15:48:14 UTC (rev 25652)
@@ -374,6 +374,25 @@
}
+#pragma mark defines for 10.6 api not documented in 10.5
+#ifndef MAC_OS_X_VERSION_10_6
+
+ at interface NSEvent(SnowLeopardEvents)
+/* modifier keys currently down. This returns the state of devices combined
+ with synthesized events at the moment, independent of which events
+ have been delivered via the event stream. */
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
++ (unsigned int)modifierFlags; //NSUInteger is defined only from 10.5
+#else
++ (NSUInteger)modifierFlags;
+#endif
+ at end
+
+#endif
+
+
+#pragma mark Utility functions
+
#define FIRSTFILEBUFLG 512
static bool g_hasFirstFile = false;
static char g_firstFileBuf[512];
@@ -883,11 +902,7 @@
#else
//If build against an older SDK, check if running on 10.6 to use the correct function
if ([NSEvent respondsToSelector:@selector(modifierFlags)]) {
-#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
- modifiers = (unsigned int)[NSEvent modifierFlags];
-#else
- modifiers = (NSUInteger)[NSEvent modifierFlags];
-#endif
+ modifiers = [NSEvent modifierFlags];
}
else {
//TODO: need to find a better workaround for the missing cocoa "getModifierFlag" function in 10.4/10.5
Modified: trunk/blender/source/blender/blenkernel/BKE_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_utildefines.h 2010-01-01 15:05:31 UTC (rev 25651)
+++ trunk/blender/source/blender/blenkernel/BKE_utildefines.h 2010-01-01 15:48:14 UTC (rev 25652)
@@ -97,7 +97,9 @@
/* some math and copy defines */
+#ifndef SWAP
#define SWAP(type, a, b) { type sw_ap; sw_ap=(a); (a)=(b); (b)=sw_ap; }
+#endif
#define ABS(a) ( (a)<0 ? (-(a)) : (a) )
More information about the Bf-blender-cvs
mailing list