|
720 | 720 | #endif // !defined(BOOST_ASIO_WINDOWS) |
721 | 721 |
|
722 | 722 | // Windows: target OS version. |
723 | | -#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) |
| 723 | +#if defined(BOOST_ASIO_WINDOWS) |
724 | 724 | # if !defined(_WIN32_WINNT) && !defined(_WIN32_WINDOWS) |
725 | 725 | # if defined(_MSC_VER) || (defined(__BORLANDC__) && !defined(__clang__)) |
726 | 726 | # pragma message( \ |
|
753 | 753 | # endif // !defined(_WINSOCK2API_) |
754 | 754 | # endif // defined(__WIN32__) && !defined(WIN32) |
755 | 755 | # endif // defined(__BORLANDC__) |
756 | | -# if defined(__CYGWIN__) |
757 | | -# if !defined(__USE_W32_SOCKETS) |
758 | | -# error You must add -D__USE_W32_SOCKETS to your compiler options. |
759 | | -# endif // !defined(__USE_W32_SOCKETS) |
760 | | -# endif // defined(__CYGWIN__) |
761 | 756 | #endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) |
762 | 757 |
|
763 | 758 | // Windows: minimise header inclusion. |
764 | | -#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) |
| 759 | +#if defined(BOOST_ASIO_WINDOWS) |
765 | 760 | # if !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN) |
766 | 761 | # if !defined(WIN32_LEAN_AND_MEAN) |
767 | 762 | # define WIN32_LEAN_AND_MEAN |
|
770 | 765 | #endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) |
771 | 766 |
|
772 | 767 | // Windows: suppress definition of "min" and "max" macros. |
773 | | -#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) |
| 768 | +#if defined(BOOST_ASIO_WINDOWS) |
774 | 769 | # if !defined(BOOST_ASIO_NO_NOMINMAX) |
775 | 770 | # if !defined(NOMINMAX) |
776 | 771 | # define NOMINMAX 1 |
|
780 | 775 |
|
781 | 776 | // Windows: IO Completion Ports. |
782 | 777 | #if !defined(BOOST_ASIO_HAS_IOCP) |
783 | | -# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) |
| 778 | +# if defined(BOOST_ASIO_WINDOWS) |
784 | 779 | # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400) |
785 | 780 | # if !defined(UNDER_CE) && !defined(BOOST_ASIO_WINDOWS_APP) |
786 | 781 | # if !defined(BOOST_ASIO_DISABLE_IOCP) |
|
882 | 877 | #if !defined(BOOST_ASIO_HAS_SERIAL_PORT) |
883 | 878 | # if defined(BOOST_ASIO_HAS_IOCP) \ |
884 | 879 | || !defined(BOOST_ASIO_WINDOWS) \ |
885 | | - && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ |
886 | | - && !defined(__CYGWIN__) |
| 880 | + && !defined(BOOST_ASIO_WINDOWS_RUNTIME) |
887 | 881 | # if !defined(__SYMBIAN32__) |
888 | 882 | # if !defined(BOOST_ASIO_DISABLE_SERIAL_PORT) |
889 | 883 | # define BOOST_ASIO_HAS_SERIAL_PORT 1 |
|
916 | 910 | // Windows: object handles. |
917 | 911 | #if !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE) |
918 | 912 | # if !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE) |
919 | | -# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) |
| 913 | +# if defined(BOOST_ASIO_WINDOWS) |
920 | 914 | # if !defined(UNDER_CE) && !defined(BOOST_ASIO_WINDOWS_APP) |
921 | 915 | # define BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE 1 |
922 | 916 | # endif // !defined(UNDER_CE) && !defined(BOOST_ASIO_WINDOWS_APP) |
|
937 | 931 | #if !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR) |
938 | 932 | # if !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR) |
939 | 933 | # if !defined(BOOST_ASIO_WINDOWS) \ |
940 | | - && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ |
941 | | - && !defined(__CYGWIN__) |
| 934 | + && !defined(BOOST_ASIO_WINDOWS_RUNTIME) |
942 | 935 | # define BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR 1 |
943 | 936 | # endif // !defined(BOOST_ASIO_WINDOWS) |
944 | 937 | // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) |
|
970 | 963 | #if !defined(BOOST_ASIO_HAS_PIPE) |
971 | 964 | # if defined(BOOST_ASIO_HAS_IOCP) \ |
972 | 965 | || !defined(BOOST_ASIO_WINDOWS) \ |
973 | | - && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ |
974 | | - && !defined(__CYGWIN__) |
| 966 | + && !defined(BOOST_ASIO_WINDOWS_RUNTIME) |
975 | 967 | # if !defined(__SYMBIAN32__) |
976 | 968 | # if !defined(BOOST_ASIO_DISABLE_PIPE) |
977 | 969 | # define BOOST_ASIO_HAS_PIPE 1 |
|
987 | 979 | #if !defined(BOOST_ASIO_HAS_SIGACTION) |
988 | 980 | # if !defined(BOOST_ASIO_DISABLE_SIGACTION) |
989 | 981 | # if !defined(BOOST_ASIO_WINDOWS) \ |
990 | | - && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ |
991 | | - && !defined(__CYGWIN__) |
| 982 | + && !defined(BOOST_ASIO_WINDOWS_RUNTIME) |
992 | 983 | # define BOOST_ASIO_HAS_SIGACTION 1 |
993 | 984 | # endif // !defined(BOOST_ASIO_WINDOWS) |
994 | 985 | // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) |
|
1008 | 999 | // Can use getaddrinfo() and getnameinfo(). |
1009 | 1000 | #if !defined(BOOST_ASIO_HAS_GETADDRINFO) |
1010 | 1001 | # if !defined(BOOST_ASIO_DISABLE_GETADDRINFO) |
1011 | | -# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) |
| 1002 | +# if defined(BOOST_ASIO_WINDOWS) |
1012 | 1003 | # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) |
1013 | 1004 | # define BOOST_ASIO_HAS_GETADDRINFO 1 |
1014 | 1005 | # elif defined(UNDER_CE) |
|
0 commit comments