diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/ser-tcp.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a08d868..9f44d03 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2011-10-28 Alen Skondro <askondro@gmail.com> + + * ser-tcp.c [USE_WIN32API] (ETIMEOUT): Don't define if already + defined. + 2011-10-27 Meador Inge <meadori@codesourcery.com> * MAINTAINERS (Write After Approval): Add myself to the list. diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c index e3d5640..4f2dcdd 100644 --- a/gdb/ser-tcp.c +++ b/gdb/ser-tcp.c @@ -39,7 +39,9 @@ #ifdef USE_WIN32API #include <winsock2.h> +#ifndef ETIMEDOUT #define ETIMEDOUT WSAETIMEDOUT +#endif #define close(fd) closesocket (fd) #define ioctl ioctlsocket #else |