diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-29 14:58:58 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-29 14:58:58 -0700 |
| commit | b8f61c11c94708d4f17720a55945dee4621315a4 (patch) | |
| tree | b44b17c5b88cd45070d31c15c02f5e876d671dc1 /hw/xwin | |
| parent | 5596f10cce58295d8af73646352b314ecb3ddfca (diff) | |
| parent | f51e42f583073bde0bc8131887cb7220636c8855 (diff) | |
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'hw/xwin')
| -rw-r--r-- | hw/xwin/InitOutput.c | 10 | ||||
| -rw-r--r-- | hw/xwin/winerror.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 22ef8da76..4fe5053b3 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -191,7 +191,7 @@ ddxBeforeReset (void) /* See Porting Layer Definition - p. 57 */ void -ddxGiveUp (void) +ddxGiveUp (enum ExitCode error) { int i; @@ -228,7 +228,7 @@ ddxGiveUp (void) g_pszLogFile = LogInit (g_pszLogFile, NULL); g_fLogInited = TRUE; } - LogClose (); + LogClose (error); /* * At this point we aren't creating any new screens, so @@ -258,12 +258,12 @@ ddxGiveUp (void) /* See Porting Layer Definition - p. 57 */ void -AbortDDX (void) +AbortDDX (enum ExitCode error) { #if CYGDEBUG winDebug ("AbortDDX\n"); #endif - ddxGiveUp (); + ddxGiveUp (error); } #ifdef __CYGWIN__ @@ -901,7 +901,7 @@ ddxUseMsg(void) g_pszLogFile = LogInit (g_pszLogFile, NULL); g_fLogInited = TRUE; } - LogClose (); + LogClose (EXIT_NO_ERROR); /* Notify user where UseMsg text can be found.*/ if (!g_fNoHelpMessageBox) diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c index 5e32d090d..0440d13ff 100644 --- a/hw/xwin/winerror.c +++ b/hw/xwin/winerror.c @@ -81,7 +81,7 @@ OsVendorFatalError (void) g_fLogInited = TRUE; g_pszLogFile = LogInit (g_pszLogFile, NULL); } - LogClose (); + LogClose (EXIT_ERR_ABORT); winMessageBoxF ( "A fatal error has occurred and " PROJECT_NAME " will now exit.\n" \ |