diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-25 07:51:00 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-25 07:51:00 +0000 |
| commit | dca37d126746d995167a31f58d3a395ae162f5d4 (patch) | |
| tree | 6f5a0e00be9e5f70d6bc341d4abdb1f14c8f79a2 /xorg-server/miext/rootless/rootlessWindow.c | |
| parent | 23fda7c555e6c749b1d9727be5e5571a0559b9b3 (diff) | |
| parent | 24bc15a386e37908396c3f6088f6fc98ceaa0f46 (diff) | |
| download | vcxsrv-dca37d126746d995167a31f58d3a395ae162f5d4.tar.gz vcxsrv-dca37d126746d995167a31f58d3a395ae162f5d4.tar.bz2 vcxsrv-dca37d126746d995167a31f58d3a395ae162f5d4.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/miext/rootless/rootlessWindow.c')
| -rw-r--r-- | xorg-server/miext/rootless/rootlessWindow.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c index 53028b5c1..dbea3f8d1 100644 --- a/xorg-server/miext/rootless/rootlessWindow.c +++ b/xorg-server/miext/rootless/rootlessWindow.c @@ -78,7 +78,6 @@ extern int darwinMainScreenX, darwinMainScreenY; return atom; \ } - DEFINE_ATOM_HELPER (xa_native_window_id, "_NATIVE_WINDOW_ID") static Bool windows_hidden; @@ -985,7 +984,7 @@ StartFrameResize(WindowPtr pWin, Bool gravity, copy_rect.y2 = oldY2; } else - abort(); + OsAbort(); Bpp = winRec->win->drawable.bitsPerPixel / 8; copy_rect_width = copy_rect.x2 - copy_rect.x1; |