chacha/glide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Unify multi-arch implementation of _grErrorDefaultCallback() function.

Browse Source
This commit is contained in:
guillemj
2003-11-08 08:39:15 +00:00
parent e229833d24
commit e08300cb43
3 changed files with 33 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
glide2x/h3/glide/src/gerror.c
View File

@@ -20,6 +20,9 @@
** **
** $Header$ ** $Header$
** $Log$ ** $Log$
** Revision 1.1.1.1 1999/12/07 21:49:27 joseph
** Initial checkin into SourceForge.
**
** **
** 3 3/17/99 6:16p Dow ** 3 3/17/99 6:16p Dow
** Phantom Menace and other fixes. ** Phantom Menace and other fixes.
@@ -159,35 +162,25 @@ GR_DIENTRY(grErrorSetCallback, void,
GrErrorCallback = function; GrErrorCallback = function;
} }
#ifdef __WIN32__
void void
_grErrorDefaultCallback( const char *s, FxBool fatal ) _grErrorDefaultCallback( const char *s, FxBool fatal )
{ {
if ( fatal ) { if ( fatal ) {
GDBG_ERROR("glide", s); GDBG_ERROR("glide", s);
grGlideShutdown(); 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) #ifdef __WIN32__
{ MessageBox(NULL, s, NULL, MB_OK);
Str255 errBuf; #elif (GLIDE_PLATFORM & GLIDE_OS_MACOS)
{
errBuf[0] = sprintf((char*)(errBuf + 1), "%s", s); Str255 errBuf;
DebugStr(errBuf);
} errBuf[0] = sprintf((char*)(errBuf + 1), "%s", s);
DebugStr(errBuf);
}
#endif /* (GLIDE_PLATFORM * GLIDE_OS_MACOS) */ #endif /* (GLIDE_PLATFORM * GLIDE_OS_MACOS) */
} }
} }
#endif
#ifdef __DOS__ #ifdef __DOS__
int _guHeapCheck( void ) int _guHeapCheck( void )

29
glide3x/h3/glide3/src/gerror.c
View File

@@ -20,6 +20,9 @@
** **
** $Header$ ** $Header$
** $Log$ ** $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 ** Revision 1.2.6.3 2003/11/03 07:27:50 guillemj
** Remove unbalanced #endif. ** Remove unbalanced #endif.
** **
@@ -206,36 +209,26 @@ GR_DIENTRY(grErrorSetCallback, void,
GrErrorCallback = function; GrErrorCallback = function;
} }
#ifdef __WIN32__
void void
_grErrorDefaultCallback( const char *s, FxBool fatal ) _grErrorDefaultCallback( const char *s, FxBool fatal )
{ {
if ( fatal ) { if ( fatal ) {
GDBG_ERROR("glide", s); GDBG_ERROR("glide", s);
grGlideShutdown(); grGlideShutdown();
#ifdef __WIN32__
MessageBox(NULL, s, NULL, MB_OK); MessageBox(NULL, s, NULL, MB_OK);
exit(1); exit(1);
} #elif (GLIDE_PLATFORM & GLIDE_OS_MACOS)
} {
#else Str255 errBuf;
void
_grErrorDefaultCallback( const char *s, FxBool fatal )
{
if ( fatal ) {
GDBG_ERROR("glide",s);
grGlideShutdown();
#if (GLIDE_PLATFORM & GLIDE_OS_MACOS) errBuf[0] = sprintf((char*)(errBuf + 1), "%s", s);
{ DebugStr(errBuf);
Str255 errBuf; }
errBuf[0] = sprintf((char*)(errBuf + 1), "%s", s);
DebugStr(errBuf);
}
#endif /* (GLIDE_PLATFORM * GLIDE_OS_MACOS) */ #endif /* (GLIDE_PLATFORM * GLIDE_OS_MACOS) */
} }
} }
#endif
/* /*
#if !defined(__linux__) && !defined(__FreeBSD__) #if !defined(__linux__) && !defined(__FreeBSD__)

30
glide3x/h5/glide3/src/gerror.c
View File

@@ -209,38 +209,28 @@ GR_DIENTRY(grErrorSetCallback, void,
GrErrorCallback = function; GrErrorCallback = function;
} }
#ifdef __WIN32__
void void
_grErrorDefaultCallback( const char *s, FxBool fatal ) _grErrorDefaultCallback( const char *s, FxBool fatal )
{ {
if ( fatal ) { if ( fatal ) {
GDBG_ERROR("glide", s); GDBG_ERROR("glide", s);
grGlideShutdown(); grGlideShutdown();
#ifdef __WIN32__
MessageBox(NULL, s, NULL, MB_OK); MessageBox(NULL, s, NULL, MB_OK);
exit(1); exit(1);
} #elif (GLIDE_PLATFORM & GLIDE_OS_MACOS)
} {
#else //Str255 errBuf;
void
_grErrorDefaultCallback( const char *s, FxBool fatal )
{
if ( fatal ) {
GDBG_ERROR("glide",s);
grGlideShutdown();
#if (GLIDE_PLATFORM & GLIDE_OS_MACOS) //errBuf[0] = sprintf((char*)(errBuf + 1), "%s", s);
{ //DebugStr(errBuf);
//Str255 errBuf; ErrorMacCallback(s);
ExitToShell();
//errBuf[0] = sprintf((char*)(errBuf + 1), "%s", s); }
//DebugStr(errBuf);
ErrorMacCallback(s);
ExitToShell();
}
#endif /* (GLIDE_PLATFORM * GLIDE_OS_MACOS) */ #endif /* (GLIDE_PLATFORM * GLIDE_OS_MACOS) */
} }
} }
#endif
void void
_grAssert(char *exp, char *fileName, int lineNo) _grAssert(char *exp, char *fileName, int lineNo)