cpp/openttd-patchpack/source Changeset - r2223:e7b00765cfd4

Changeset - r2223:e7b00765cfd4

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

bjarni - 19 years ago 2005-07-28 21:47:41
bjarni@openttd.org

(svn r2741) -Feature: [OSX] added a window to display asserts on OSX (Tobin)

4 files changed with 32 insertions and 3 deletions:

os/macosx/macos.h

os/macosx/macos.m

stdafx.h

unix.c

0 comments (0 inline, 0 general)

os/macosx/macos.h

➞

Show inline comments

@@ @@ -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 */

os/macosx/macos.m

➞

Show inline comments

@@ @@ -13,3 +13,14 @@ void ShowMacDialog ( const char *title, @@
 	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();
+}

stdafx.h

➞

Show inline comments

@@ @@ -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

unix.c

➞

Show inline comments

@@ @@ -43,7 +43,6 @@ ULONG __stack = (1024*1024)*2; // maybe @@
 		//the mac implementation needs this file included in the same file as main()
 		#include <SDL.h>
 	#endif
 	#include "os/macosx/macos.h"
 #endif
 static char *_fios_path;

0 comments (0 inline, 0 general)