diff --git a/glide2x/h3/glide/src/gerror.c b/glide2x/h3/glide/src/gerror.c index 851cbf2..70417dc 100644 --- a/glide2x/h3/glide/src/gerror.c +++ b/glide2x/h3/glide/src/gerror.c @@ -20,6 +20,9 @@ ** ** $Header$ ** $Log$ +** Revision 1.1.1.1 1999/12/07 21:49:27 joseph +** Initial checkin into SourceForge. +** ** ** 3 3/17/99 6:16p Dow ** Phantom Menace and other fixes. @@ -159,35 +162,25 @@ GR_DIENTRY(grErrorSetCallback, void, GrErrorCallback = function; } -#ifdef __WIN32__ void _grErrorDefaultCallback( const char *s, FxBool fatal ) { if ( fatal ) { GDBG_ERROR("glide", s); grGlideShutdown(); - MessageBox(NULL, s, NULL, MB_OK); - } -} -#else -void -_grErrorDefaultCallback( const char *s, FxBool fatal ) -{ - if ( fatal ) { - GDBG_ERROR("glide",s); - grGlideShutdown(); -#if (GLIDE_PLATFORM & GLIDE_OS_MACOS) - { - Str255 errBuf; - - errBuf[0] = sprintf((char*)(errBuf + 1), "%s", s); - DebugStr(errBuf); - } +#ifdef __WIN32__ + MessageBox(NULL, s, NULL, MB_OK); +#elif (GLIDE_PLATFORM & GLIDE_OS_MACOS) + { + Str255 errBuf; + + errBuf[0] = sprintf((char*)(errBuf + 1), "%s", s); + DebugStr(errBuf); + } #endif /* (GLIDE_PLATFORM * GLIDE_OS_MACOS) */ } } -#endif #ifdef __DOS__ int _guHeapCheck( void ) diff --git a/glide3x/h3/glide3/src/gerror.c b/glide3x/h3/glide3/src/gerror.c index d5a6d63..787886e 100644 --- a/glide3x/h3/glide3/src/gerror.c +++ b/glide3x/h3/glide3/src/gerror.c @@ -20,6 +20,9 @@ ** ** $Header$ ** $Log$ +** Revision 1.2.6.4 2003/11/04 12:53:38 dborca +** Removed balanced #endif. +** ** Revision 1.2.6.3 2003/11/03 07:27:50 guillemj ** Remove unbalanced #endif. ** @@ -206,36 +209,26 @@ GR_DIENTRY(grErrorSetCallback, void, GrErrorCallback = function; } -#ifdef __WIN32__ void _grErrorDefaultCallback( const char *s, FxBool fatal ) { if ( fatal ) { GDBG_ERROR("glide", s); grGlideShutdown(); + +#ifdef __WIN32__ MessageBox(NULL, s, NULL, MB_OK); exit(1); - } -} -#else -void -_grErrorDefaultCallback( const char *s, FxBool fatal ) -{ - if ( fatal ) { - GDBG_ERROR("glide",s); - grGlideShutdown(); +#elif (GLIDE_PLATFORM & GLIDE_OS_MACOS) + { + Str255 errBuf; -#if (GLIDE_PLATFORM & GLIDE_OS_MACOS) - { - Str255 errBuf; - - errBuf[0] = sprintf((char*)(errBuf + 1), "%s", s); - DebugStr(errBuf); - } + errBuf[0] = sprintf((char*)(errBuf + 1), "%s", s); + DebugStr(errBuf); + } #endif /* (GLIDE_PLATFORM * GLIDE_OS_MACOS) */ } } -#endif /* #if !defined(__linux__) && !defined(__FreeBSD__) diff --git a/glide3x/h5/glide3/src/gerror.c b/glide3x/h5/glide3/src/gerror.c index a04474a..0778ca0 100644 --- a/glide3x/h5/glide3/src/gerror.c +++ b/glide3x/h5/glide3/src/gerror.c @@ -209,38 +209,28 @@ GR_DIENTRY(grErrorSetCallback, void, GrErrorCallback = function; } -#ifdef __WIN32__ void _grErrorDefaultCallback( const char *s, FxBool fatal ) { if ( fatal ) { GDBG_ERROR("glide", s); grGlideShutdown(); + +#ifdef __WIN32__ MessageBox(NULL, s, NULL, MB_OK); exit(1); - } -} -#else -void -_grErrorDefaultCallback( const char *s, FxBool fatal ) -{ - if ( fatal ) { - GDBG_ERROR("glide",s); - grGlideShutdown(); +#elif (GLIDE_PLATFORM & GLIDE_OS_MACOS) + { + //Str255 errBuf; -#if (GLIDE_PLATFORM & GLIDE_OS_MACOS) - { - //Str255 errBuf; - - //errBuf[0] = sprintf((char*)(errBuf + 1), "%s", s); - //DebugStr(errBuf); - ErrorMacCallback(s); - ExitToShell(); - } + //errBuf[0] = sprintf((char*)(errBuf + 1), "%s", s); + //DebugStr(errBuf); + ErrorMacCallback(s); + ExitToShell(); + } #endif /* (GLIDE_PLATFORM * GLIDE_OS_MACOS) */ } } -#endif void _grAssert(char *exp, char *fileName, int lineNo)