startx.cpp and default server (patch provided)

[Jeremy C. Reed]

Now looking at the new changes for __APPLE__, why not just use that for 
any platform? That should fix my problem on non-__APPLE__ too.

> diff --git a/startx.cpp b/startx.cpp
> index 7e67769..9931281 100644
> --- a/startx.cpp
> +++ b/startx.cpp
> @@ -216,17 +216,17 @@ XCOMM process server arguments
>  if [ x"$server" = x ]; then
>      XCOMM if no server arguments or display either, use rc file instead
>      if [ x"$serverargs" = x -a x"$display" = x ]; then
>  #ifdef __APPLE__
>  	server=$defaultserver
>  	serverargs=$defaultserverargs
>  	display="$defaultdisplay"
>  #else
> -	server="$defaultserverargs"
> +	server="$defaultserver $defaultserverargs"
>  #endif
>      else
>  	server=$defaultserver
>      fi
>  fi
>  
>  if [ x"$enable_xauth" = x1 ] ; then
>      if [ x"$XAUTHORITY" = x ]; then