diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-21 07:55:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-21 07:55:46 +0200 |
| commit | 1bf52245e51f23656a3520056b440a633ea5a61b (patch) | |
| tree | 4e175b2e2a4a843e101d582ba996eaef336f90fc /xorg-server/hw/xquartz/mach-startup/bundle-main.c | |
| parent | 0f140f539691e1657d8ea0fcbcca2d5947574406 (diff) | |
| parent | 7cd970786d72a68b735f33904bdded6c8aebdf33 (diff) | |
| download | vcxsrv-1bf52245e51f23656a3520056b440a633ea5a61b.tar.gz vcxsrv-1bf52245e51f23656a3520056b440a633ea5a61b.tar.bz2 vcxsrv-1bf52245e51f23656a3520056b440a633ea5a61b.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/xquartz/mach-startup/bundle-main.c')
| -rw-r--r-- | xorg-server/hw/xquartz/mach-startup/bundle-main.c | 17 |
1 files changed, 17 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 cabdf1eab..b40366244 100644 --- a/xorg-server/hw/xquartz/mach-startup/bundle-main.c +++ b/xorg-server/hw/xquartz/mach-startup/bundle-main.c @@ -563,8 +563,25 @@ setup_console_redirect(const char *bundle_id) free(asl_facility); asl_set_filter(aslc, ASL_FILTER_MASK_UPTO(ASL_LEVEL_WARNING)); + +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 +# if MAC_OS_X_VERSION_MIN_REQUIRED < 1080 + if (asl_log_descriptor) +# endif + { + asl_log_descriptor(aslc, NULL, ASL_LEVEL_INFO, STDOUT_FILENO, ASL_LOG_DESCRIPTOR_WRITE); + asl_log_descriptor(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO, ASL_LOG_DESCRIPTOR_WRITE); + } +# if MAC_OS_X_VERSION_MIN_REQUIRED < 1080 + else { + xq_asl_capture_fd(aslc, NULL, ASL_LEVEL_INFO, STDOUT_FILENO); + xq_asl_capture_fd(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO); + } +# endif +#else xq_asl_capture_fd(aslc, NULL, ASL_LEVEL_INFO, STDOUT_FILENO); xq_asl_capture_fd(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO); +#endif } static void |