diff options
| author | Juanma Barranquero | 2002-04-08 16:45:43 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2002-04-08 16:45:43 +0000 |
| commit | a0ad186021d7c1cc86555e7de2877b4e57b9fca5 (patch) | |
| tree | 9caa94e2b412f6834c080d3e4886f877967f4c5e /src | |
| parent | 968b980cd80c28e6d05a6ee083586ec2d1b585f8 (diff) | |
| download | emacs-a0ad186021d7c1cc86555e7de2877b4e57b9fca5.tar.gz emacs-a0ad186021d7c1cc86555e7de2877b4e57b9fca5.zip | |
(sys_accept): Don't hide variable `s'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/w32.c | 6 |
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 @@ | |||
| 1 | 2002-04-08 Juanma Barranquero <lektu@terra.es> | ||
| 2 | |||
| 3 | * w32.c (sys_accept): Don't hide variable `s'. | ||
| 4 | |||
| 1 | 2002-04-05 Gerd Moellmann <gerd@gnu.org> | 5 | 2002-04-05 Gerd Moellmann <gerd@gnu.org> |
| 2 | 6 | ||
| 3 | * callint.c (Fcall_interactively): Use INTEGERP instead of | 7 | * callint.c (Fcall_interactively): Use INTEGERP instead of |
| @@ -3022,9 +3022,9 @@ sys_accept (int s, struct sockaddr * addr, int * addrlen) | |||
| 3022 | check_errno (); | 3022 | check_errno (); |
| 3023 | if (fd_info[s].flags & FILE_SOCKET) | 3023 | if (fd_info[s].flags & FILE_SOCKET) |
| 3024 | { | 3024 | { |
| 3025 | SOCKET s = pfn_accept (SOCK_HANDLE (s), addr, addrlen); | 3025 | SOCKET t = pfn_accept (SOCK_HANDLE (s), addr, addrlen); |
| 3026 | if (s != INVALID_SOCKET) | 3026 | if (t != INVALID_SOCKET) |
| 3027 | return socket_to_fd (s); | 3027 | return socket_to_fd (t); |
| 3028 | 3028 | ||
| 3029 | set_errno (); | 3029 | set_errno (); |
| 3030 | return -1; | 3030 | return -1; |