diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2009-08-18 21:48:29 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2009-08-18 21:48:29 +0200 |
| commit | 312a3179638c36ef2b7aea4be70f24bd72851ce0 (patch) | |
| tree | 977b6df1e27f81c127c5bbb69c8fece320479bfd /startx.cpp | |
| parent | fe046aa3b2d2789ebe6a795e6271de5cd3dfbb51 (diff) | |
| parent | 33c3dae16b632ab56b6b361273a48079eb0a41c4 (diff) | |
Merge commit 'origin/master' into obsd
Diffstat (limited to 'startx.cpp')
| -rw-r--r-- | startx.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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 + |