[PATCH] ETIMEDOUT already defined in mingw64 library

[PATCH] ETIMEDOUT already defined in mingw64 library

[Alen Skondro]

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

This fixes the problem compiling gdb with latest mingw64 library (trunk).

* ETIMEDOUT is already defined in mingw64.

=================================================

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

[-- Attachment #2: diff-mingw64.patch --]
[-- Type: application/octet-stream, Size: 306 bytes --]

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

Re: [PATCH] ETIMEDOUT already defined in mingw64 library

[Pedro Alves]

On Thursday 27 October 2011 23:14:40, Alen Skondro wrote:
> This fixes the problem compiling gdb with latest mingw64 library (trunk).
> 
> * ETIMEDOUT is already defined in mingw64.

OOC, if you're getting an error, it's because it's defined
to something different.  What is is defined to?

> 
> =================================================
> 
> 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
> 

-- 
Pedro Alves

Re: [PATCH] ETIMEDOUT already defined in mingw64 library

[asmwarrior]

On 2011-10-28 16:50, Pedro Alves wrote:
> OOC, if you're getting an error, it's because it's defined
> to something different.  What is is defined to?
In file:
i686-w64-mingw32\include\errno.h

It was defined as below:

/* Defined as WSAETIMEDOUT.  */
#ifndef ETIMEDOUT
#define ETIMEDOUT 10060
#endif

Re: [PATCH] ETIMEDOUT already defined in mingw64 library

[asmwarrior]

On 2011-10-28 21:12, asmwarrior wrote:
> On 2011-10-28 16:50, Pedro Alves wrote:
>> OOC, if you're getting an error, it's because it's defined
>> to something different.  What is is defined to?
> In file:
> i686-w64-mingw32\include\errno.h
> 
> It was defined as below:
> 
> /* Defined as WSAETIMEDOUT.  */
> #ifndef ETIMEDOUT
> #define ETIMEDOUT 10060
> #endif
> 
> 

BTW:
WSAETIMEDOUT can be found in two places:

i686-w64-mingw32\include\psdk_inc\_wsa_errnos.h

line 43:
#define WSAETIMEDOUT		(WSABASEERR + 60  )
and WSABASEERR is defined by:
#define WSABASEERR		10000

In another place:
i686-w64-mingw32\include\winerror.h line 1646
#define WSAETIMEDOUT 10060L

I'm not sure which header file does \gdb\ser-tcp.c use.

So, it looks like all the ETIMEDOUT definition is actually the same value.

Re: [PATCH] ETIMEDOUT already defined in mingw64 library

[Pedro Alves]

On Friday 28 October 2011 14:21:12, asmwarrior wrote:
> On 2011-10-28 21:12, asmwarrior wrote:
> > On 2011-10-28 16:50, Pedro Alves wrote:
> >> OOC, if you're getting an error, it's because it's defined
> >> to something different.  What is is defined to?
> > In file:
> > i686-w64-mingw32\include\errno.h
> > 
> > It was defined as below:
> > 
> > /* Defined as WSAETIMEDOUT.  */
> > #ifndef ETIMEDOUT
> > #define ETIMEDOUT 10060
> > #endif

Thanks.

> I'm not sure which header file does \gdb\ser-tcp.c use.
> 
> So, it looks like all the ETIMEDOUT definition is actually the same value.

Alright.  gcc complains because the definitions aren't textually the
same, even though they expand to the same.  I've applied Alen's
patch, with this ChangeLog entry:

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

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

Thanks.

-- 
Pedro Alves