From f37fe8ec030759069bd7c00cecf2fd55c8e6f9ff Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 30 Mar 2010 14:39:51 +0000 Subject: svn merge -r516:HEAD ^/branches/released . --- xorg-server/os/log.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'xorg-server/os/log.c') diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c index 6e9b183b8..68d9ca80e 100644 --- a/xorg-server/os/log.c +++ b/xorg-server/os/log.c @@ -123,6 +123,12 @@ static char *saveBuffer = NULL; static int bufferSize = 0, bufferUnused = 0, bufferPos = 0; static Bool needBuffer = TRUE; +#ifdef __APPLE__ +static char __crashreporter_info_buff__[4096] = {0}; +static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0]; +asm (".desc __crashreporter_info__, 0x10"); +#endif + /* Prefix strings for log messages. */ #ifndef X_UNKNOWN_STRING #define X_UNKNOWN_STRING "(\?\?)" @@ -534,6 +540,9 @@ FatalError(const char *f, ...) ErrorF("\nFatal server error:\n"); va_start(args, f); +#ifdef __APPLE__ + (void)vsnprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__), f, args); +#endif VErrorF(f, args); va_end(args); ErrorF("\n"); -- cgit v1.2.3