Browse Source

Add extra parentheses to avoid and/or priority ambiguity

tags/v1.4.90
Pierre Ossman 9 years ago
parent
commit
7728be27d0
3 changed files with 4 additions and 3 deletions
  1. 1
    1
      common/rfb/VNCSConnectionST.cxx
  2. 1
    1
      unix/vncconfig/vncExt.c
  3. 2
    1
      win/rfb_win32/WMCursor.cxx

+ 1
- 1
common/rfb/VNCSConnectionST.cxx View File

@@ -1131,7 +1131,7 @@ void VNCSConnectionST::setStatus(int status)
accessRights = accessRights | AccessPtrEvents | AccessKeyEvents | AccessView;
break;
case 1:
accessRights = accessRights & ~(AccessPtrEvents | AccessKeyEvents) | AccessView;
accessRights = (accessRights & ~(AccessPtrEvents | AccessKeyEvents)) | AccessView;
break;
case 2:
accessRights = accessRights & ~(AccessPtrEvents | AccessKeyEvents | AccessView);

+ 1
- 1
unix/vncconfig/vncExt.c View File

@@ -328,7 +328,7 @@ Bool XVncExtGetQueryConnect(Display* dpy, char** addr, char** user,
if (!*addr || !*user) {
Xfree(*addr);
Xfree(*user);
_XEatData(dpy, (rep.addrLen+1)&~1 + (rep.userLen+1)&~1);
_XEatData(dpy, ((rep.addrLen+1)&~1) + ((rep.userLen+1)&~1));
return False;
}
_XReadPad(dpy, *addr, rep.addrLen);

+ 2
- 1
win/rfb_win32/WMCursor.cxx View File

@@ -49,7 +49,8 @@ WMCursor::WMCursor() : hooks(0), use_getCursorInfo(false), cursor(0) {
#ifdef RFB_HAVE_GETCURSORINFO
// Check the OS version
bool is_win98 = (osVersion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) &&
(osVersion.dwMajorVersion > 4) || ((osVersion.dwMajorVersion == 4) && (osVersion.dwMinorVersion > 0));
((osVersion.dwMajorVersion > 4) ||
((osVersion.dwMajorVersion == 4) && (osVersion.dwMinorVersion > 0)));
bool is_win2K = (osVersion.dwPlatformId == VER_PLATFORM_WIN32_NT) && (osVersion.dwMajorVersion >= 5);

// Use GetCursorInfo if OS version is sufficient

Loading…
Cancel
Save