diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-24 18:34:17 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-24 18:34:17 +0000 |
| commit | 24bc15a386e37908396c3f6088f6fc98ceaa0f46 (patch) | |
| tree | c66f27ec96c869f10ef53d73ed7dd5e5e0860605 /xorg-server/miext | |
| parent | 6f0a8e51f20073ea01ac5dae8e5c4d49076fc65e (diff) | |
| download | vcxsrv-24bc15a386e37908396c3f6088f6fc98ceaa0f46.tar.gz vcxsrv-24bc15a386e37908396c3f6088f6fc98ceaa0f46.tar.bz2 vcxsrv-24bc15a386e37908396c3f6088f6fc98ceaa0f46.zip | |
Git update 24/2/2010"
Diffstat (limited to 'xorg-server/miext')
| -rw-r--r-- | xorg-server/miext/damage/damage.c | 10 | ||||
| -rw-r--r-- | xorg-server/miext/rootless/rootlessWindow.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/miext/damage/damage.c b/xorg-server/miext/damage/damage.c index b7ec92a5b..2851aed8d 100644 --- a/xorg-server/miext/damage/damage.c +++ b/xorg-server/miext/damage/damage.c @@ -1705,7 +1705,7 @@ damageRemoveDamage (DamagePtr *pPrev, DamagePtr pDamage) } #if DAMAGE_VALIDATE_ENABLE ErrorF ("Damage not on list\n"); - abort (); + OsAbort (); #endif } @@ -1718,7 +1718,7 @@ damageInsertDamage (DamagePtr *pPrev, DamagePtr pDamage) for (pOld = *pPrev; pOld; pOld = pOld->pNext) if (pOld == pDamage) { ErrorF ("Damage already on list\n"); - abort (); + OsAbort (); } #endif pDamage->pNext = *pPrev; @@ -1971,7 +1971,7 @@ DamageRegister (DrawablePtr pDrawable, if (pDrawable->pScreen != pDamage->pScreen) { ErrorF ("DamageRegister called with mismatched screens\n"); - abort (); + OsAbort (); } #endif @@ -1986,7 +1986,7 @@ DamageRegister (DrawablePtr pDrawable, for (pOld = *pPrev; pOld; pOld = pOld->pNextWin) if (pOld == pDamage) { ErrorF ("Damage already on window list\n"); - abort (); + OsAbort (); } #endif pDamage->pNextWin = *pPrev; @@ -2040,7 +2040,7 @@ DamageUnregister (DrawablePtr pDrawable, #if DAMAGE_VALIDATE_ENABLE if (!found) { ErrorF ("Damage not on window list\n"); - abort (); + OsAbort (); } #endif } diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c index 53209565d..e78e2c8f1 100644 --- a/xorg-server/miext/rootless/rootlessWindow.c +++ b/xorg-server/miext/rootless/rootlessWindow.c @@ -978,7 +978,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; |