diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-23 12:38:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-23 12:38:03 +0000 |
| commit | 98a78a31883c4b5d63dd1465b4208bcc7c12bfcb (patch) | |
| tree | fdb125ad89bd8b0fae5c3580558989367f666f2b /xorg-server/hw/xquartz/X11Application.m | |
| parent | 215417a52a66f9a2252c64f24e417297eba2331f (diff) | |
| parent | ae87f2594b9439cb63a6b52e42e09504b687aea3 (diff) | |
| download | vcxsrv-98a78a31883c4b5d63dd1465b4208bcc7c12bfcb.tar.gz vcxsrv-98a78a31883c4b5d63dd1465b4208bcc7c12bfcb.tar.bz2 vcxsrv-98a78a31883c4b5d63dd1465b4208bcc7c12bfcb.zip | |
merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/X11Application.m')
| -rw-r--r-- | xorg-server/hw/xquartz/X11Application.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/hw/xquartz/X11Application.m b/xorg-server/hw/xquartz/X11Application.m index 3d845d914..f9928345f 100644 --- a/xorg-server/hw/xquartz/X11Application.m +++ b/xorg-server/hw/xquartz/X11Application.m @@ -1269,7 +1269,7 @@ static const char *untrusted_str(NSEvent *e) { #if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION > 0
/* Older libXplugin (Tiger/"Stock" Leopard) aren't thread safe, so we can't call xp_find_window from the Appkit thread */
xp_window_id wid = 0;
- xp_error e;
+ xp_error err;
/* Sigh. Need to check that we're really over one of
* our windows. (We need to receive pointer events while
@@ -1277,9 +1277,9 @@ static const char *untrusted_str(NSEvent *e) { * when another window is over us or we might show a tooltip)
*/
- e = xp_find_window(location.x, location.y, 0, &wid);
+ err = xp_find_window(location.x, location.y, 0, &wid);
- if (e != XP_Success || (e == XP_Success && wid == 0))
+ if (err != XP_Success || (err == XP_Success && wid == 0))
#endif
{
bgMouseLocation = location;
|