summaryrefslogtreecommitdiff
path: root/startx.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'startx.cpp')
-rw-r--r--startx.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/startx.cpp b/startx.cpp
index f911499..a1adbf5 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -279,7 +279,7 @@ if [ x"$enable_xauth" = x1 ] ; then
xauth -q -f "$xserverauthfile" << EOF
add :$dummy . $mcookie
EOF
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__CYGWIN__)
serverargs=${serverargs}" -auth '"${xserverauthfile}"'"
#else
serverargs=${serverargs}" -auth "${xserverauthfile}
@@ -313,13 +313,14 @@ else
fi
#else
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__CYGWIN__)
eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs
#else
XINIT "$client" $clientargs -- "$server" $display $serverargs
#endif
#endif
+retval=$?
if [ x"$enable_xauth" = x1 ] ; then
if [ x"$removelist" != x ]; then
@@ -347,3 +348,6 @@ screenrestore
#if defined(sun)
kbd_mode -a
#endif
+
+exit $retval
+