summaryrefslogtreecommitdiff
path: root/hw/xquartz/X11Controller.m
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xquartz/X11Controller.m')
-rw-r--r--hw/xquartz/X11Controller.m8
1 files changed, 0 insertions, 8 deletions
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 81ad3c639..bc976bf5f 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -347,10 +347,8 @@ extern char *bundle_id_prefix;
const char *newargv[4];
char buf[128];
char *s;
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
int stdout_pipe[2];
int stderr_pipe[2];
-#endif
newargv[0] = [X11App prefs_get_string:@PREFS_LOGIN_SHELL default:"/bin/sh"];
newargv[1] = "-c";
@@ -363,7 +361,6 @@ extern char *bundle_id_prefix;
setenv("DISPLAY", buf, TRUE);
}
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
if (&asl_log_descriptor) {
char *asl_sender;
aslmsg amsg = asl_new(ASL_TYPE_MSG);
@@ -395,7 +392,6 @@ extern char *bundle_id_prefix;
asl_free(amsg);
}
-#endif
/* Do the fork-twice trick to avoid having to reap zombies */
child1 = fork();
@@ -413,13 +409,11 @@ extern char *bundle_id_prefix;
_exit(1);
case 0: /* child2 */
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
if (&asl_log_descriptor) {
/* Replace our stdout/stderr */
dup2(stdout_pipe[1], STDOUT_FILENO);
dup2(stderr_pipe[1], STDERR_FILENO);
}
-#endif
/* close all open files except for standard streams */
max_files = sysconf(_SC_OPEN_MAX);
@@ -442,13 +436,11 @@ extern char *bundle_id_prefix;
waitpid(child1, &status, 0);
}
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
if (&asl_log_descriptor) {
/* Close the write ends of the pipe */
close(stdout_pipe[1]);
close(stderr_pipe[1]);
}
-#endif
}
- (void) app_selected:sender