diff options
| author | DRC <dcommander@users.sourceforge.net> | 2010-10-27 07:11:46 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2010-10-27 07:11:46 +0000 |
| commit | 9d58619669df0e0e9b7b63b3247d5b7591ceba9a (patch) | |
| tree | 65d2e52aa1aca6b5ecf2f0e585fecd673553d9b2 /win | |
| parent | c48fa194d08d5d3b7de0442f9ccd3762eacc858d (diff) | |
| download | tigervnc-9d58619669df0e0e9b7b63b3247d5b7591ceba9a.tar.gz tigervnc-9d58619669df0e0e9b7b63b3247d5b7591ceba9a.zip | |
Avoid conflict with Visual C++ abs() intrinsic
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4169 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'win')
| -rw-r--r-- | win/rfb_win32/CPointer.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win/rfb_win32/CPointer.cxx b/win/rfb_win32/CPointer.cxx index 5a5894b6..03f8a386 100644 --- a/win/rfb_win32/CPointer.cxx +++ b/win/rfb_win32/CPointer.cxx @@ -54,7 +54,7 @@ void CPointer::pointerEvent(InputHandler* writer, const Point& pos, int buttonMa } -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 @@ void CPointer::threePointerEvent(InputHandler* writer, const Point& pos, int but 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(); |