aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2011-10-28 13:32:05 +0000
committerPedro Alves <palves@redhat.com>2011-10-28 13:32:05 +0000
commit8e7ebaf5c67a872bc43a484528712847a62e4bf2 (patch)
tree7f7d493885fed4382e7aedc089fd44ff7d15f4e9 /gdb
parent006ad0a1b5c57af8f791e333ca0932cf64b6df2f (diff)
downloadfsf-binutils-gdb-8e7ebaf5c67a872bc43a484528712847a62e4bf2.zip
fsf-binutils-gdb-8e7ebaf5c67a872bc43a484528712847a62e4bf2.tar.gz
fsf-binutils-gdb-8e7ebaf5c67a872bc43a484528712847a62e4bf2.tar.bz2
2011-10-28 Alen Skondro <askondro@gmail.com>
* ser-tcp.c [USE_WIN32API] (ETIMEOUT): Don't define if already defined.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/ser-tcp.c2
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