folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCP: Avoid noisy compiles on some Cygwin builds

Browse source 
Some from suggestion in #760 with extra condition consistent with other
conditionals already present.
This commit is contained in:
Mark Pizzolato 2019-10-30 20:35:24 -07:00
parent 34a133ce2e
commit 82d897712c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sim_sock.c
View file

@ -1045,7 +1045,7 @@ int keepalive = 1;
defined (__APPLE__) || defined (__OpenBSD__) || \ defined (__APPLE__) || defined (__OpenBSD__) || \
defined(__NetBSD__) || defined(__FreeBSD__) || \ defined(__NetBSD__) || defined(__FreeBSD__) || \
(defined(__hpux) && defined(_XOPEN_SOURCE_EXTENDED)) || \ (defined(__hpux) && defined(_XOPEN_SOURCE_EXTENDED)) || \
defined (__HAIKU__) defined (__HAIKU__) || defined(__CYGWIN__)
socklen_t size; socklen_t size;
#elif defined (_WIN32) || defined (__EMX__) || \ #elif defined (_WIN32) || defined (__EMX__) || \
(defined (__ALPHA) && defined (__unix__)) || \ (defined (__ALPHA) && defined (__unix__)) || \
@ -1111,7 +1111,7 @@ struct sockaddr_storage peername;
defined (__APPLE__) || defined (__OpenBSD__) || \ defined (__APPLE__) || defined (__OpenBSD__) || \
defined(__NetBSD__) || defined(__FreeBSD__) || \ defined(__NetBSD__) || defined(__FreeBSD__) || \
(defined(__hpux) && defined(_XOPEN_SOURCE_EXTENDED)) || \ (defined(__hpux) && defined(_XOPEN_SOURCE_EXTENDED)) || \
defined (__HAIKU__) defined (__HAIKU__) || defined(__CYGWIN__)
socklen_t peernamesize = (socklen_t)sizeof(peername); socklen_t peernamesize = (socklen_t)sizeof(peername);
#elif defined (_WIN32) || defined (__EMX__) || \ #elif defined (_WIN32) || defined (__EMX__) || \
(defined (__ALPHA) && defined (__unix__)) || \ (defined (__ALPHA) && defined (__unix__)) || \
@ -1147,7 +1147,7 @@ static int _sim_getaddrname (struct sockaddr *addr, size_t addrsize, char *hostn
defined (__APPLE__) || defined (__OpenBSD__) || \ defined (__APPLE__) || defined (__OpenBSD__) || \
defined(__NetBSD__) || defined(__FreeBSD__) || \ defined(__NetBSD__) || defined(__FreeBSD__) || \
(defined(__hpux) && defined(_XOPEN_SOURCE_EXTENDED)) || \ (defined(__hpux) && defined(_XOPEN_SOURCE_EXTENDED)) || \
defined (__HAIKU__) defined (__HAIKU__) || defined(__CYGWIN__)
socklen_t size = (socklen_t)addrsize; socklen_t size = (socklen_t)addrsize;
#elif defined (_WIN32) || defined (__EMX__) || \ #elif defined (_WIN32) || defined (__EMX__) || \
(defined (__ALPHA) && defined (__unix__)) || \ (defined (__ALPHA) && defined (__unix__)) || \
@ -1181,7 +1181,7 @@ struct sockaddr_storage sockname, peername;
defined (__APPLE__) || defined (__OpenBSD__) || \ defined (__APPLE__) || defined (__OpenBSD__) || \
defined(__NetBSD__) || defined(__FreeBSD__) || \ defined(__NetBSD__) || defined(__FreeBSD__) || \
(defined(__hpux) && defined(_XOPEN_SOURCE_EXTENDED)) || \ (defined(__hpux) && defined(_XOPEN_SOURCE_EXTENDED)) || \
defined (__HAIKU__) defined (__HAIKU__) || defined(__CYGWIN__)
socklen_t socknamesize = (socklen_t)sizeof(sockname); socklen_t socknamesize = (socklen_t)sizeof(sockname);
socklen_t peernamesize = (socklen_t)sizeof(peername); socklen_t peernamesize = (socklen_t)sizeof(peername);
#elif defined (_WIN32) || defined (__EMX__) || \ #elif defined (_WIN32) || defined (__EMX__) || \