From 1d59691fe77c20ecb010ea8589a940c4ea6ac356 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 2 Apr 2010 12:30:48 +0000 Subject: Updated to following packages: pixman-0.18.0 xorg-server-1.8.0 --- xorg-server/hw/xquartz/darwin.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'xorg-server/hw/xquartz/darwin.c') diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c index 066f5a596..d3f448820 100644 --- a/xorg-server/hw/xquartz/darwin.c +++ b/xorg-server/hw/xquartz/darwin.c @@ -602,7 +602,7 @@ void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv ) /* - * OsVendorFataError + * OsVendorFatalError */ void OsVendorFatalError( void ) { @@ -760,7 +760,7 @@ void ddxUseMsg( void ) */ void ddxGiveUp( void ) { - ErrorF( "Quitting Xquartz...\n" ); + ErrorF( "Quitting Xquartz\n" ); } @@ -773,11 +773,7 @@ void ddxGiveUp( void ) void AbortDDX( void ) { ErrorF( " AbortDDX\n" ); - /* - * This is needed for a abnormal server exit, since the normal exit stuff - * MUST also be performed (i.e. the vt must be left in a defined state) - */ - ddxGiveUp(); + OsAbort(); } #include "mivalidate.h" // for union _Validate used by windowstr.h -- cgit v1.2.3