2011-10-28 Alen Skondro <askondro@gmail.com>

	* ser-tcp.c [USE_WIN32API] (ETIMEOUT): Don't define if already
	defined.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a08d86861a1e7c81c25e22ce06848cf1a3f0ba02..9f44d03ca4078a4644bd6c60b4c57eabe13d96f7 100644 (file)
--- 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 e3d56405047b587ff0e0de9add0be5dda6127f40..4f2dcdd0d25ce58e17c9a2c8c2c63ec539cf798b 100644 (file)
--- 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