Mercurial > hg > openttd
changeset 2223:b192b50186cf draft
(svn r2741) -Feature: [OSX] added a window to display asserts on OSX (Tobin)
| author | bjarni <bjarni@openttd.org> |
|---|---|
| date | Thu, 28 Jul 2005 21:47:41 +0000 |
| parents | c32e3c546291 |
| children | 9da25b5a0f2d |
| files | os/macosx/macos.h os/macosx/macos.m stdafx.h unix.c |
| diffstat | 4 files changed, 32 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/os/macosx/macos.h +++ b/os/macosx/macos.h @@ -2,5 +2,18 @@ #define MACOS_H void ShowMacDialog ( const char *title, const char *message, const char *buttonLabel ); +void ShowMacAssertDialog ( const char *function, const char *file, const int line, const char *expression ); -#endif /* MACOS_H */ \ No newline at end of file +// Since MacOS X users will never see an assert unless they started the game from a terminal +// we're using a custom assert(e) macro. +#undef assert + +#ifdef NDEBUG +#define assert(e) ((void)0) +#else + +#define assert(e) \ + (__builtin_expect(!(e), 0) ? ShowMacAssertDialog ( __func__, __FILE__, __LINE__, #e ): (void)0 ) +#endif + +#endif /* MACOS_H */
--- a/os/macosx/macos.m +++ b/os/macosx/macos.m @@ -13,3 +13,14 @@ NSRunAlertPanel([NSString stringWithCString: title], [NSString stringWithCString: message], [NSString stringWithCString: buttonLabel], nil, nil); } +void ShowMacAssertDialog ( const char *function, const char *file, const int line, const char *expression ) +{ + const char *buffer = + [[NSString stringWithFormat:@"An assertion has failed and OpenTTD must quit.\n%s in %s (line %d)\n\"%s\"\n\nYou should report this error the OpenTTD developers if you think you found a bug.", + function, file, line, expression] cStringUsingEncoding:NSASCIIStringEncoding]; + NSLog(@"%s", buffer); + ShowMacDialog( "Assertion Failed", buffer, "Quit" ); + + // abort so that a debugger has a chance to notice + abort(); +}
--- a/stdafx.h +++ b/stdafx.h @@ -20,10 +20,16 @@ #endif #include <stdio.h> -#include <assert.h> #include <string.h> #include <stdlib.h> +// MacOS X will use an NSAlert to display failed assertaions since they're lost unless running from a terminal +#if !defined(__APPLE__) +#include <assert.h> +#else +#include "os/macosx/macos.h" +#endif + #if defined(UNIX) || defined(__MINGW32__) # include <sys/types.h> #endif