aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xquartz/mach-startup
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-05-23 12:30:27 +0000
committermarha <marha@users.sourceforge.net>2011-05-23 12:30:27 +0000
commitae87f2594b9439cb63a6b52e42e09504b687aea3 (patch)
treea0a59232ccde314cb2032d2856f1eb3b8701d3f8 /xorg-server/hw/xquartz/mach-startup
parent52011cfedaa930d61d8f60b283a2051093727582 (diff)
downloadvcxsrv-ae87f2594b9439cb63a6b52e42e09504b687aea3.tar.gz
vcxsrv-ae87f2594b9439cb63a6b52e42e09504b687aea3.tar.bz2
vcxsrv-ae87f2594b9439cb63a6b52e42e09504b687aea3.zip
xserver git update 23 May 2011
Diffstat (limited to 'xorg-server/hw/xquartz/mach-startup')
-rw-r--r--xorg-server/hw/xquartz/mach-startup/bundle-main.c5
-rw-r--r--xorg-server/hw/xquartz/mach-startup/stub.c1
2 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/hw/xquartz/mach-startup/bundle-main.c b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
index 8e3437644..94c606823 100644
--- a/xorg-server/hw/xquartz/mach-startup/bundle-main.c
+++ b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
@@ -66,6 +66,8 @@
/* From darwinEvents.c ... but don't want to pull in all the server cruft */
void DarwinListenOnOpenFD(int fd);
+extern aslclient aslc;
+
/* Ditto, from os/log.c */
extern void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
extern void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_NORETURN;
@@ -485,7 +487,6 @@ static void ensure_path(const char *dir) {
static void setup_console_redirect(const char *bundle_id) {
char *asl_sender;
char *asl_facility;
- aslclient aslc;
asprintf(&asl_sender, "%s.server", bundle_id);
assert(asl_sender);
@@ -644,7 +645,7 @@ int main(int argc, char **argv, char **envp) {
child2 = fork();
switch (child2) {
- int max_files, i;
+ int max_files;
case -1: /* error */
FatalError("fork() failed: %s\n", strerror(errno));
diff --git a/xorg-server/hw/xquartz/mach-startup/stub.c b/xorg-server/hw/xquartz/mach-startup/stub.c
index 8319dd06e..d8e4abdd1 100644
--- a/xorg-server/hw/xquartz/mach-startup/stub.c
+++ b/xorg-server/hw/xquartz/mach-startup/stub.c
@@ -164,6 +164,7 @@ static void send_fd_handoff(int connected_fd, int launchd_fd) {
close(connected_fd);
}
+__attribute__((__noreturn__))
static void signal_handler(int sig) {
if(x11app_pid)
kill(x11app_pid, sig);