startx.cpp and default server (patch provided)

[Jeremy C. Reed]

> I'd vote for that... but I've just been careful about protecting what I 
> commit with '#ifdef __APPLE__' since I haven't been really testing them 
> elsewhere...

I simplified it some more:

diff --git a/startx.cpp b/startx.cpp
index 7e67769..63b211b 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -214,17 +214,11 @@ fi
 
 XCOMM process server arguments
 if [ x"$server" = x ]; then
+    server=$defaultserver
     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"
-#endif
-    else
-	server=$defaultserver
     fi
 fi


If no complaints or improvements I will commit that soon. 

  Jeremy C. Reed