From 4787c5a8db870b0cff2326bd750c4d96c7d84e51 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 18 May 2010 12:10:10 +0000 Subject: svn merge -r603:HEAD "^/branches/released" . --- xorg-server/hw/xquartz/mach-startup/bundle-main.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'xorg-server/hw/xquartz/mach-startup') diff --git a/xorg-server/hw/xquartz/mach-startup/bundle-main.c b/xorg-server/hw/xquartz/mach-startup/bundle-main.c index 42aa757ea..63a185fc8 100644 --- a/xorg-server/hw/xquartz/mach-startup/bundle-main.c +++ b/xorg-server/hw/xquartz/mach-startup/bundle-main.c @@ -75,7 +75,12 @@ extern int noPanoramiXExtension; static char __crashreporter_info_buff__[4096] = {0}; static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0]; +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 +// This is actually a toolchain requirement, but I'm not sure the correct check, +// but it should be fine to just only include it for Leopard and later. This line +// just tells the linker to never strip this symbol (such as for space optimization) asm (".desc ___crashreporter_info__, 0x10"); +#endif static const char *__crashreporter_info__base = "X.Org X Server " XSERVER_VERSION " Build Date: " BUILD_DATE; -- cgit v1.2.3