From 8e7ebaf5c67a872bc43a484528712847a62e4bf2 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 28 Oct 2011 13:32:05 +0000 Subject: [PATCH] 2011-10-28 Alen Skondro * ser-tcp.c [USE_WIN32API] (ETIMEOUT): Don't define if already defined. --- gdb/ChangeLog | 5 +++++ gdb/ser-tcp.c | 2 ++ 2 files changed, 7 insertions(+) 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 + + * ser-tcp.c [USE_WIN32API] (ETIMEOUT): Don't define if already + defined. + 2011-10-27 Meador Inge * 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 +#ifndef ETIMEDOUT #define ETIMEDOUT WSAETIMEDOUT +#endif #define close(fd) closesocket (fd) #define ioctl ioctlsocket #else -- 2.7.4