summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2002-04-08 16:45:43 +0000
committerJuanma Barranquero <lekktu@gmail.com>2002-04-08 16:45:43 +0000
commita0ad186021d7c1cc86555e7de2877b4e57b9fca5 (patch)
tree9caa94e2b412f6834c080d3e4886f877967f4c5e
parent968b980cd80c28e6d05a6ee083586ec2d1b585f8 (diff)
downloademacs-a0ad186021d7c1cc86555e7de2877b4e57b9fca5.tar.gz
(sys_accept): Don't hide variable `s'.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32.c6
2 files changed, 7 insertions, 3 deletions
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;