diff options
| author | Yang Tse <yangsita@gmail.com> | 2006-08-04 01:13:24 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2006-08-04 01:13:24 +0000 |
| commit | f55924b3e04db8ca63e01c0d59aac73442843845 (patch) | |
| tree | 303c8994db95f9832431ecb5f3eb9f700daf64f2 | |
| parent | 7240acdebcb1c5f2f7b11e9bf5fcfcac77cedb53 (diff) | |
Avoid redundant check. configure script takes care of not defining
HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H, neither
HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
| -rw-r--r-- | ares/setup.h | 6 | ||||
| -rw-r--r-- | lib/setup.h | 6 | ||||
| -rw-r--r-- | src/setup.h | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/ares/setup.h b/ares/setup.h index f3ced3ed8..70af3be3c 100644 --- a/ares/setup.h +++ b/ares/setup.h @@ -47,10 +47,12 @@ * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs * to any other further and independant block. Under Cygwin things work * just as under linux (e.g. <sys/socket.h>) and the winsock headers should - * never be included when __CYGWIN__ is defined. + * never be included when __CYGWIN__ is defined. configure script takes + * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H, + * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined. */ -#if defined(HAVE_WINDOWS_H) && !defined(__CYGWIN__) +#ifdef HAVE_WINDOWS_H # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif diff --git a/lib/setup.h b/lib/setup.h index 12f00540b..3538256c4 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -81,10 +81,12 @@ * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs * to any other further and independant block. Under Cygwin things work * just as under linux (e.g. <sys/socket.h>) and the winsock headers should - * never be included when __CYGWIN__ is defined. + * never be included when __CYGWIN__ is defined. configure script takes + * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H, + * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined. */ -#if defined(HAVE_WINDOWS_H) && !defined(__CYGWIN__) +#ifdef HAVE_WINDOWS_H # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif diff --git a/src/setup.h b/src/setup.h index 78cb11593..1acd19e85 100644 --- a/src/setup.h +++ b/src/setup.h @@ -83,10 +83,12 @@ * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs * to any other further and independant block. Under Cygwin things work * just as under linux (e.g. <sys/socket.h>) and the winsock headers should - * never be included when __CYGWIN__ is defined. + * never be included when __CYGWIN__ is defined. configure script takes + * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H, + * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined. */ -#if defined(HAVE_WINDOWS_H) && !defined(__CYGWIN__) +#ifdef HAVE_WINDOWS_H # ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN # endif |