aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/os/log.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-03-30 14:39:51 +0000
committermarha <marha@users.sourceforge.net>2010-03-30 14:39:51 +0000
commitf37fe8ec030759069bd7c00cecf2fd55c8e6f9ff (patch)
tree03b82272fdd55070146d5c6c6aa4062446c0f0f8 /xorg-server/os/log.c
parentff48c0d9098080b51ea12710029135916d117806 (diff)
downloadvcxsrv-f37fe8ec030759069bd7c00cecf2fd55c8e6f9ff.tar.gz
vcxsrv-f37fe8ec030759069bd7c00cecf2fd55c8e6f9ff.tar.bz2
vcxsrv-f37fe8ec030759069bd7c00cecf2fd55c8e6f9ff.zip
svn merge -r516:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/os/log.c')
-rw-r--r--xorg-server/os/log.c9
1 files changed, 9 insertions, 0 deletions
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");