Revision: 4169
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4169&view=rev
Author: dcommander
Date: 2010-10-27 07:11:46 +0000 (Wed, 27 Oct 2010)
Log Message:
-----------
Avoid conflict with Visual C++ abs() intrinsic
Modified Paths:
--------------
trunk/win/rfb_win32/CPointer.cxx
Modified: trunk/win/rfb_win32/CPointer.cxx
===================================================================
--- trunk/win/rfb_win32/CPointer.cxx 2010-10-26 19:32:25 UTC (rev 4168)
+++ trunk/win/rfb_win32/CPointer.cxx 2010-10-27 07:11:46 UTC (rev 4169)
@@ -54,7 +54,7 @@
}
-inline int abs(int x) {return x>0 ? x : 0;}
+inline int _abs(int x) {return x>0 ? x : 0;}
int emulate3Mask(int buttonMask) {
// - Release left & right and press middle
@@ -102,7 +102,7 @@
if (threeTimer.isActive()) {
// - We are timing for an emulation event
- if (abs(threePos.x - pos.x) <= 4 || abs(threePos.y - pos.y) <= 4) {
+ if (_abs(threePos.x - pos.x) <= 4 || _abs(threePos.y - pos.y) <= 4) {
// If the mouse has moved too far since the button-change event
then flush
vlog.debug("emulate3: stop timer (moved)");
threeTimer.stop();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
