diff -uNr xc/programs/xinit/startx.cpp xc-new/programs/xinit/startx.cpp
--- xc/programs/xinit/startx.cpp	Mon Jan 28 13:27:34 2002
+++ xc-new/programs/xinit/startx.cpp	Fri Oct 10 22:33:20 2003
@@ -82,7 +82,7 @@
 whoseargs="client"
 while [ x"$1" != x ]; do
     case "$1" in
-    # '' required to prevent cpp from treating "/*" as a C comment.
+    XCOMM '' required to prevent cpp from treating "/*" as a C comment.
     /''*|\./''*)
 	if [ "$whoseargs" = "client" ]; then
 	    if [ x"$clientargs" = x ]; then
@@ -105,7 +105,7 @@
 	if [ "$whoseargs" = "client" ]; then
 	    clientargs="$clientargs $1"
 	else
-	    # display must be the FIRST server argument
+	    XCOMM display must be the FIRST server argument
 	    if [ x"$serverargs" = x ] && \
 		 expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then
 		display="$1"
@@ -120,7 +120,7 @@
 
 XCOMM process client arguments
 if [ x"$client" = x ]; then
-    # if no client arguments either, use rc file instead
+    XCOMM if no client arguments either, use rc file instead
     if [ x"$clientargs" = x ]; then
 	client="$defaultclientargs"
     else
@@ -130,7 +130,7 @@
 
 XCOMM process server arguments
 if [ x"$server" = x ]; then
-    # if no server arguments or display either, use rc file instead
+    XCOMM if no server arguments or display either, use rc file instead
     if [ x"$serverargs" = x -a x"$display" = x ]; then
 	server="$defaultserverargs"
     else