--- a/Socket.st	Wed Mar 02 15:06:45 2005 +0100
+++ b/Socket.st	Wed Mar 02 15:08:06 2005 +0100
@@ -2267,7 +2267,7 @@
 
     if (fp != nil) {
 	int    sock;
-	int option = -1;
+	int opt = -1;
 	int level = -1;
 	int usize = -1;
 	int ret;
@@ -2282,7 +2282,7 @@
 # ifdef SO_BROADCAST
 	if (option == @symbol(SO_BROADCAST)) {
 	    /* Enables transmission and receipt of broadcast messages on the socket. */
-	    option = SO_BROADCAST;
+	    opt = SO_BROADCAST;
 	    level = SOL_SOCKET;
 	    usize = sizeof(u.u_bool);
 	    if (arg1 == true) u.u_bool = TRUE;
@@ -2295,7 +2295,7 @@
 #  if 0
 	if (option == @symbol(SO_CONDITIONAL)) {
 	    /* Enables sockets to delay the acknowledgment of a connection until after the WSAAccept condition function is called. */
-	    option = SO_CONDITIONAL;
+	    opt = SO_CONDITIONAL;
 	    level = SOL_SOCKET;
 	    usize = sizeof(u.u_bool);
 	    if (arg1 == true) u.u_bool = TRUE;
@@ -2308,7 +2308,7 @@
 # ifdef SO_DEBUG
 	if (option == @symbol(SO_DEBUG)) {
 	    /* Records debugging information. */
-	    option = SO_DEBUG;
+	    opt = SO_DEBUG;
 	    level = SOL_SOCKET;
 	    usize = sizeof(u.u_bool);
 	    if (arg1 == true) u.u_bool = TRUE;
@@ -2321,7 +2321,7 @@
 	    if (option == @symbol(SO_DONTLINGER)) {
 		/* Does not block close waiting for unsent data to be sent.
 		   Setting this option is equivalent to setting SO_LINGER with l_onoff set to zero. */
-		option = SO_DONTLINGER;
+		opt = SO_DONTLINGER;
 		level = SOL_SOCKET;
 		usize = sizeof(u.u_bool);
 		if (arg1 == true) u.u_bool = TRUE;
@@ -2336,7 +2336,7 @@
 	       Succeeds but is ignored on AF_INET sockets;
 	       fails on AF_INET6 sockets with WSAENOPROTOOPT.
 	       Not supported on ATM sockets (results in an error). */
-	    option = SO_DONTROUTE;
+	    opt = SO_DONTROUTE;
 	    level = SOL_SOCKET;
 	    usize = sizeof(u.u_bool);
 	    if (arg1 == true) u.u_bool = TRUE;
@@ -2348,7 +2348,7 @@
 # ifdef SO_KEEPALIVE
 	if (option == @symbol(SO_KEEPALIVE)) {
 	    /* Sends keep-alives. Not supported on ATM sockets (results in an error). */
-	    option = SO_KEEPALIVE;
+	    opt = SO_KEEPALIVE;
 	    level = SOL_SOCKET;
 	    usize = sizeof(u.u_bool);
 	    if (arg1 == true) u.u_bool = TRUE;
@@ -2360,7 +2360,7 @@
 # ifdef SO_LINGER
 	if (option == @symbol(SO_LINGER)) {
 	    /* Lingers on close if unsent data is present. */
-	    option = SO_LINGER;
+	    opt = SO_LINGER;
 	    level = SOL_SOCKET;
 	    usize = sizeof(u.u_linger);
 	    if (arg1 == true) u.u_linger.l_onoff = TRUE;
@@ -2376,7 +2376,7 @@
 # ifdef SO_OOBINLINE
 	if (option == @symbol(SO_OOBINLINE)) {
 	    /* Receives OOB data in the normal data stream. */
-	    option = SO_OOBINLINE;
+	    opt = SO_OOBINLINE;
 	    level = SOL_SOCKET;
 	    usize = sizeof(u.u_bool);
 	    if (arg1 == true) u.u_bool = TRUE;
@@ -2389,7 +2389,7 @@
 	if (option == @symbol(SO_RCVBUF)) {
 	    /* Specifies the total per-socket buffer space reserved for receives.
 	       This is unrelated to SO_MAX_MSG_SIZE or the size of a TCP window. */
-	    option = SO_RCVBUF;
+	    opt = SO_RCVBUF;
 	    level = SOL_SOCKET;
 	    usize = sizeof(u.u_int);
 	    if (__isSmallInteger(arg1))u.u_int = __intVal(arg1);
@@ -2401,7 +2401,7 @@
 	if (option == @symbol(SO_SNDBUF)) {
 	    /* Specifies the total per-socket buffer space reserved for sends.
 	       This is unrelated to SO_MAX_MSG_SIZE or the size of a TCP window. */
-	    option = SO_SNDBUF;
+	    opt = SO_SNDBUF;
 	    level = SOL_SOCKET;
 	    usize = sizeof(u.u_int);
 	    if (__isSmallInteger(arg1))u.u_int = __intVal(arg1);
@@ -2412,7 +2412,7 @@
 # ifdef SO_REUSEADDR
 	if (option == @symbol(SO_REUSEADDR)) {
 	    /* Allows the socket to be bound to an address that is already in use.  */
-	    option = SO_REUSEADDR;
+	    opt = SO_REUSEADDR;
 	    level = SOL_SOCKET;
 	    usize = sizeof(u.u_bool);
 	    if (arg1 == true) u.u_bool = TRUE;
@@ -2425,7 +2425,7 @@
 	if (option == @symbol(SO_EXCLUSIVEADDRUSE)) {
 	    /* Enables a socket to be bound for exclusive access.
 	       Does not require administrative privilege.  */
-	    option = SO_EXCLUSIVEADDRUSE;
+	    opt = SO_EXCLUSIVEADDRUSE;
 	    level = SOL_SOCKET;
 	    usize = sizeof(u.u_bool);
 	    if (arg1 == true) u.u_bool = TRUE;
@@ -3774,5 +3774,5 @@
 !Socket class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.208 2005-03-02 14:06:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.209 2005-03-02 14:08:06 cg Exp $'
 ! !