diff options
| -rw-r--r-- | composite/compwindow.c | 2 | ||||
| -rw-r--r-- | glx/glthread.c | 2 | ||||
| -rw-r--r-- | hw/dmx/examples/xinput.c | 2 | ||||
| -rw-r--r-- | hw/kdrive/src/kdrive.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 2 | ||||
| -rw-r--r-- | hw/xquartz/GL/capabilities.c | 2 | ||||
| -rw-r--r-- | miext/damage/damage.c | 10 | ||||
| -rw-r--r-- | miext/rootless/rootlessWindow.c | 2 | ||||
| -rw-r--r-- | os/log.c | 4 |
9 files changed, 14 insertions, 14 deletions
diff --git a/composite/compwindow.c b/composite/compwindow.c index c10cb9ee9..f2f6ea3cd 100644 --- a/composite/compwindow.c +++ b/composite/compwindow.c @@ -205,7 +205,7 @@ compPositionWindow (WindowPtr pWin, int x, int y) #ifdef COMPOSITE_DEBUG if ((pWin->redirectDraw != RedirectDrawNone) != (pWin->viewable && (GetCompWindow(pWin) != NULL))) - abort (); + OsAbort (); #endif if (pWin->redirectDraw != RedirectDrawNone) { diff --git a/glx/glthread.c b/glx/glthread.c index 4caaea110..8b9f61885 100644 --- a/glx/glthread.c +++ b/glx/glthread.c @@ -129,7 +129,7 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr) _X_EXPORT unsigned long _glthread_GetID(void) { - abort(); /* XXX not implemented yet */ + OsAbort(); /* XXX not implemented yet */ return (unsigned long) 0; } diff --git a/hw/dmx/examples/xinput.c b/hw/dmx/examples/xinput.c index 74353a93b..7421be337 100644 --- a/hw/dmx/examples/xinput.c +++ b/hw/dmx/examples/xinput.c @@ -233,7 +233,7 @@ int main(int argc, char **argv) int total = 0; #define ADD(type) \ - if (cnt >= MAX_EVENTS) abort(); \ + if (cnt >= MAX_EVENTS) OsAbort(); \ names[cnt] = #type; \ type(dev, event_type[cnt], event_list[cnt]); \ if (event_type[cnt]) ++cnt diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index 7675c1e86..1902ab885 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -335,7 +335,7 @@ AbortDDX(void) } if (kdCaughtSignal) - abort(); + OsAbort(); } void diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 2c206ff47..72241a776 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1235,7 +1235,7 @@ ddxGiveUp(void) /* If an unexpected signal was caught, dump a core for debugging */ if (xf86Info.caughtSignal) - abort(); + OsAbort(); } diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c index 43064044c..5f1f87013 100644 --- a/hw/xquartz/GL/capabilities.c +++ b/hw/xquartz/GL/capabilities.c @@ -522,7 +522,7 @@ bool getGlCapabilities(struct glCapabilities *cap) { conf = malloc(sizeof(*conf)); if(NULL == conf) { perror("malloc"); - abort(); + OsAbort(); } /* Copy the struct. */ diff --git a/miext/damage/damage.c b/miext/damage/damage.c index b7ec92a5b..2851aed8d 100644 --- a/miext/damage/damage.c +++ b/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/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c index 53209565d..e78e2c8f1 100644 --- a/miext/rootless/rootlessWindow.c +++ b/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; @@ -413,7 +413,7 @@ AbortServer(void) AbortDDX(); fflush(stderr); if (CoreDump) - abort(); + OsAbort(); exit (1); } @@ -537,7 +537,7 @@ FatalError(const char *f, ...) beenhere = TRUE; AbortServer(); } else - abort(); + OsAbort(); /*NOTREACHED*/ } |