libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* include/cygwin/in.h (struct in_addr): Guard with s_addr to avoid 

potential collision with Win32 headers.
This commit is contained in:
Corinna Vinschen 2012-10-10 08:36:33 +00:00
parent 51107c1dd9
commit 9b4d1964a7
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2012-10-10 Corinna Vinschen <corinna@vinschen.de>
* include/cygwin/in.h (struct in_addr): Guard with s_addr to avoid
potential collision with Win32 headers.
2012-10-09 Christopher Faylor <me.cygwin2012@cgf.cx> 2012-10-09 Christopher Faylor <me.cygwin2012@cgf.cx>
* child_info.h (child_info_spawn::has_execed): Remove unneeded * child_info.h (child_info_spawn::has_execed): Remove unneeded

4
winsup/cygwin/include/cygwin/in.h
View File

@ -112,11 +112,15 @@ enum
IPPORT_USERRESERVED = 5000 IPPORT_USERRESERVED = 5000
}; };
/* Avoid collision with Mingw64 headers. */
#ifndef s_addr
/* Internet address. */ /* Internet address. */
struct in_addr struct in_addr
{ {
in_addr_t s_addr; in_addr_t s_addr;
}; };
#define s_addr s_addr
#endif
/* Request struct for IPv4 multicast socket ops */ /* Request struct for IPv4 multicast socket ops */