diff options
Diffstat (limited to 'src/VBox/GuestHost/OpenGL/util/error.c')
| -rw-r--r-- | src/VBox/GuestHost/OpenGL/util/error.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/VBox/GuestHost/OpenGL/util/error.c b/src/VBox/GuestHost/OpenGL/util/error.c index 4a8254b3..48fbc577 100644 --- a/src/VBox/GuestHost/OpenGL/util/error.c +++ b/src/VBox/GuestHost/OpenGL/util/error.c @@ -125,7 +125,7 @@ static void __crCheckAustralia(void) static void outputChromiumMessage( FILE *output, char *str ) { - fprintf( output, "%s%s%s%s\n", str, + fprintf( output, "%s%s%s%s\n", str, swedish_chef ? " BORK BORK BORK!" : "", canada ? ", eh?" : "", australia ? ", mate!" : "" @@ -219,7 +219,7 @@ DECLEXPORT(void) crError(const char *format, ... ) MessageBox( NULL, txt, "Chromium Error", MB_OK ); } else - { + { #endif va_end( args ); #ifdef WINDOWS @@ -241,10 +241,13 @@ DECLEXPORT(void) crError(const char *format, ... ) } void crEnableWarnings(int onOff) -{ +{ warnings_enabled = onOff; } +#ifdef DEBUG_misha +# undef crWarning +#endif DECLEXPORT(void) crWarning(const char *format, ... ) { if (warnings_enabled) { @@ -268,7 +271,7 @@ DECLEXPORT(void) crWarning(const char *format, ... ) #endif va_end( args ); -#if defined(WINDOWS) && defined(DEBUG) && !defined(IN_GUEST) +#if defined(WINDOWS) && defined(DEBUG) && !defined(IN_GUEST) && defined(DEBUG_misha) DebugBreak(); #endif } @@ -373,13 +376,13 @@ DECLEXPORT(void) crDebug(const char *format, ... ) if (crStrlen(fnamePrefix) < sizeof (str) - sizeof (pname) - 20) { crGetProcName(pname, 1024); - sprintf(str, "%s_%s_%u.txt", fnamePrefix, pname, + sprintf(str, #ifdef RT_OS_WINDOWS - GetCurrentProcessId() + "%s_%s_%u.txt", fnamePrefix, pname, GetCurrentProcessId() #else - crGetPID() + "%s_%s_%lu.txt", fnamePrefix, pname, crGetPID() #endif - ); + ); fname = &str[0]; } } @@ -399,7 +402,7 @@ DECLEXPORT(void) crDebug(const char *format, ... ) output = fopen( fname, "w" ); if (!output) { - crError( "Couldn't open debug log %s", fname ); + crError( "Couldn't open debug log %s", fname ); } } else @@ -495,18 +498,16 @@ DECLEXPORT(void) crDebug(const char *format, ... ) outputChromiumMessage( output, txt ); #else if (!output -# ifndef DEBUG_misha +#ifndef DEBUG_misha || output==stderr -# endif +#endif ) { LogRel(("%s\n", txt)); } else { -# ifndef DEBUG_misha LogRel(("%s\n", txt)); -# endif outputChromiumMessage(output, txt); } #endif |