From: Juanma Barranquero <lekktu@gmail.com>
Date: Mon, 8 Apr 2002 16:45:43 +0000 (+0000)
Subject: (sys_accept): Don't hide variable `s'.
X-Git-Tag: ttn-vms-21-2-B4~15748
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a0ad186021d7c1cc86555e7de2877b4e57b9fca5;p=emacs.git

(sys_accept): Don't hide variable `s'.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 79f7f712466..a6619c16cc9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-08  Juanma Barranquero  <lektu@terra.es>
+
+	* w32.c (sys_accept): Don't hide variable `s'.
+
 2002-04-05  Gerd Moellmann  <gerd@gnu.org>
 
 	* callint.c (Fcall_interactively): Use INTEGERP instead of 
diff --git a/src/w32.c b/src/w32.c
index 6162c342db9..718869978e4 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3022,9 +3022,9 @@ sys_accept (int s, struct sockaddr * addr, int * addrlen)
   check_errno ();
   if (fd_info[s].flags & FILE_SOCKET)
     {
-      SOCKET s = pfn_accept (SOCK_HANDLE (s), addr, addrlen);
-      if (s != INVALID_SOCKET)
-	return socket_to_fd (s);
+      SOCKET t = pfn_accept (SOCK_HANDLE (s), addr, addrlen);
+      if (t != INVALID_SOCKET)
+	return socket_to_fd (t);
 
       set_errno ();
       return -1;