diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-18 12:10:10 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-18 12:10:10 +0000 |
| commit | 4787c5a8db870b0cff2326bd750c4d96c7d84e51 (patch) | |
| tree | d80c8bdc25dd157be487d94b0a66c809af67f4b8 /xorg-server/hw/xquartz/mach-startup | |
| parent | ec97eb93862ded9d95eb73feba6bef1c04cd13d2 (diff) | |
| download | vcxsrv-4787c5a8db870b0cff2326bd750c4d96c7d84e51.tar.gz vcxsrv-4787c5a8db870b0cff2326bd750c4d96c7d84e51.tar.bz2 vcxsrv-4787c5a8db870b0cff2326bd750c4d96c7d84e51.zip | |
svn merge -r603:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/hw/xquartz/mach-startup')
| -rw-r--r-- | xorg-server/hw/xquartz/mach-startup/bundle-main.c | 5 |
1 files changed, 5 insertions, 0 deletions
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; |