diff options
| author | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2021-03-10 13:46:23 -0800 |
|---|---|---|
| committer | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2021-03-10 13:46:23 -0800 |
| commit | db21df4054e3351d14eb7dc1c3216cd23a61cee4 (patch) | |
| tree | e2543b635559158df7ee9e0866d4d1f86c651a7f /launchd/user_startx | |
| parent | e2430bcb8327682340d985f89ad5137efa2f0d4f (diff) | |
darwin: Drop support for macOS 10.7 and earlier
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Diffstat (limited to 'launchd/user_startx')
| -rw-r--r-- | launchd/user_startx/Makefile.am | 1 | ||||
| -rw-r--r-- | launchd/user_startx/launchd_startx.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/launchd/user_startx/Makefile.am b/launchd/user_startx/Makefile.am index e895ee2..1b18db0 100644 --- a/launchd/user_startx/Makefile.am +++ b/launchd/user_startx/Makefile.am @@ -26,7 +26,6 @@ libexec_PROGRAMS = launchd_startx AM_CPPFLAGS = -I$(srcdir)/.. -DXINITDIR=\"$(xinitrcdir)\" -DBINDIR=\"$(bindir)\" dist_launchd_startx_SOURCES = \ - $(srcdir)/../console_redirect.c \ launchd_startx.c CPP_FILES_FLAGS = \ diff --git a/launchd/user_startx/launchd_startx.c b/launchd/user_startx/launchd_startx.c index 67419a4..27ce9e1 100644 --- a/launchd/user_startx/launchd_startx.c +++ b/launchd/user_startx/launchd_startx.c @@ -39,8 +39,6 @@ #include <stdlib.h> #include <spawn.h> -#include "console_redirect.h" - int main(int argc, char **argv, char **envp) { aslclient aslc; pid_t child; @@ -53,8 +51,8 @@ int main(int argc, char **argv, char **envp) { aslc = asl_open(BUNDLE_ID_PREFIX".startx", BUNDLE_ID_PREFIX, ASL_OPT_NO_DELAY); - xi_asl_capture_fd(aslc, NULL, ASL_LEVEL_INFO, STDOUT_FILENO); - xi_asl_capture_fd(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO); + 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); assert(posix_spawnp(&child, argv[1], NULL, NULL, &argv[1], envp) == 0); wait4(child, &pstat, 0, (struct rusage *)0); |