Merge pull request #59754 from matthewbauer/remove-old-patches

Cleanup; Remove old patches

28 files changed, 0 insertions, 3249 deletions

diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix
index 603d7883c647..f4931dfe5474 100644
--- a/pkgs/development/libraries/boost/1.59.nix
+++ b/pkgs/development/libraries/boost/1.59.nix
@@ -7,34 +7,4 @@ callPackage ./generic.nix (args // rec {
     url = "mirror://sourceforge/boost/boost_1_59_0.tar.bz2";
     sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj";
   };
-
-  patches = stdenv.lib.optionals stdenv.isCygwin [
-    ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch
-    ./cygwin-fedora-boost-1.50.0-pool.patch
-    ./cygwin-fedora-boost-1.57.0-mpl-print.patch
-    ./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch
-    ./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch
-    ./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch
-    ./cygwin-fedora-boost-1.57.0-pool-test_linking.patch
-    ./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch
-    ./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch
-    ./cygwin-fedora-boost-1.57.0-uuid-comparison.patch
-    ./cygwin-fedora-boost-1.57.0-move-is_class.patch
-    ./cygwin-1.40.0-cstdint-cygwin.patch
-    ./cygwin-1.57.0-asio-cygwin.patch
-    ./cygwin-1.55.0-asio-MSG_EOR.patch
-    ./cygwin-1.57.0-config-cygwin.patch
-    ./cygwin-1.57.0-context-cygwin.patch
-    ./cygwin-1.57.0-filesystem-cygwin.patch
-    ./cygwin-1.55.0-interlocked-cygwin.patch
-    ./cygwin-1.40.0-iostreams-cygwin.patch
-    ./cygwin-1.57.0-locale-cygwin.patch
-    ./cygwin-1.57.0-log-cygwin.patch
-    ./cygwin-1.40.0-python-cygwin.patch
-    ./cygwin-1.40.0-regex-cygwin.patch
-    ./cygwin-1.57.0-smart_ptr-cygwin.patch
-    ./cygwin-1.57.0-system-cygwin.patch
-    ./cygwin-1.45.0-jam-cygwin.patch
-    ./cygwin-1.50.0-jam-pep3149.patch
-  ];
 })
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch
deleted file mode 100644
index 61791c60d9e0..000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-These were fixed in ~1.7.0-46
-
---- boost_1_40_0/boost/cstdint.hpp	2009-01-14 04:18:19.000000000 -0600
-+++ boost_1_40_0/boost/cstdint.hpp	2009-08-27 23:41:34.063543700 -0500
-@@ -40,15 +40,6 @@
- #   include <inttypes.h>
- # else
- #   include <stdint.h>
--
--// There is a bug in Cygwin two _C macros
--#   if defined(__STDC_CONSTANT_MACROS) && defined(__CYGWIN__)
--#     undef INTMAX_C
--#     undef UINTMAX_C
--#     define INTMAX_C(c) c##LL
--#     define UINTMAX_C(c) c##ULL
--#   endif
--
- # endif
- 
- #ifdef __QNX__
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch
deleted file mode 100644
index 6641ba823b17..000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp	2008-03-22 16:45:55.000000000 -0500
-+++ boost_1_40_0/boost/iostreams/detail/config/wide_streams.hpp	2009-08-27 23:41:34.082544800 -0500
-@@ -44,8 +44,7 @@
- //------------------Locale support--------------------------------------------//
- 
- #ifndef BOOST_IOSTREAMS_NO_LOCALE
--# if defined(BOOST_NO_STD_LOCALE) || \
--     defined(__CYGWIN__) && \
-+# if defined(BOOST_NO_STD_LOCALE) && \
-      ( !defined(__MSL_CPP__) || defined(_MSL_NO_WCHART_CPP_SUPPORT) ) \
-      /**/
- #  define BOOST_IOSTREAMS_NO_LOCALE
---- boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp	2008-03-22 16:45:55.000000000 -0500
-+++ boost_1_40_0/boost/iostreams/detail/config/windows_posix.hpp	2009-08-27 23:41:34.087545100 -0500
-@@ -13,8 +13,7 @@
- 
- // BOOST_IOSTREAMS_POSIX or BOOST_IOSTREAMS_WINDOWS specify which API to use.
- #if !defined( BOOST_IOSTREAMS_WINDOWS ) && !defined( BOOST_IOSTREAMS_POSIX )
--# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && \
--     !defined(__CYGWIN__) \
-+# if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32))
-      /**/
- #  define BOOST_IOSTREAMS_WINDOWS
- # else
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch
deleted file mode 100644
index 7932b0e124b5..000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- boost_1_40_0/boost/python/detail/config.hpp	2007-11-25 12:07:19.000000000 -0600
-+++ boost_1_40_0/boost/python/detail/config.hpp	2009-08-27 23:41:34.092545400 -0500
-@@ -83,7 +83,7 @@
- #     endif
- #     define BOOST_PYTHON_DECL_FORWARD
- #     define BOOST_PYTHON_DECL_EXCEPTION __attribute__ ((__visibility__("default")))
--#  elif (defined(_WIN32) || defined(__CYGWIN__))
-+#  elif defined(_WIN32)
- #     if defined(BOOST_PYTHON_SOURCE)
- #        define BOOST_PYTHON_DECL __declspec(dllexport)
- #        define BOOST_PYTHON_BUILD_DLL
---- boost_1_40_0/boost/python/detail/wrap_python.hpp	2007-04-27 17:16:47.000000000 -0500
-+++ boost_1_40_0/boost/python/detail/wrap_python.hpp	2009-08-27 23:41:34.096545600 -0500
-@@ -82,8 +82,8 @@
- // Some things we need in order to get Python.h to work with compilers other
- // than MSVC on Win32
- //
--#if defined(_WIN32) || defined(__CYGWIN__)
--# if defined(__GNUC__) && defined(__CYGWIN__)
-+#if defined(_WIN32)
-+# if defined(__GNUC__)
- 
- #  define SIZEOF_LONG 4
- 
---- boost_1_40_0/boost/python/module_init.hpp	2007-06-07 13:08:54.000000000 -0500
-+++ boost_1_40_0/boost/python/module_init.hpp	2009-08-27 23:41:34.101545900 -0500
-@@ -15,7 +15,7 @@ BOOST_PYTHON_DECL void init_module(char 
- 
- }}}
- 
--#  if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(BOOST_PYTHON_STATIC_MODULE)
-+#  if defined(_WIN32) && !defined(BOOST_PYTHON_STATIC_MODULE)
- 
- #   define BOOST_PYTHON_MODULE_INIT(name)               \
- void init_module_##name();                              \
diff --git a/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch
deleted file mode 100644
index 969bb814bd10..000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- boost_1_40_0/boost/regex/v4/fileiter.hpp	2007-11-25 12:07:19.000000000 -0600
-+++ boost_1_40_0/boost/regex/v4/fileiter.hpp	2009-08-27 23:41:34.106546200 -0500
-@@ -28,11 +28,7 @@
- 
- #ifndef BOOST_REGEX_NO_FILEITER
- 
--#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(BOOST_REGEX_NO_W32)
--#error "Sorry, can't mix <windows.h> with STL code and gcc compiler: if you ran configure, try again with configure --disable-ms-windows"
--#define BOOST_REGEX_FI_WIN32_MAP
--#define BOOST_REGEX_FI_POSIX_DIR
--#elif (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32)
-+#if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32)
- #define BOOST_REGEX_FI_WIN32_MAP
- #define BOOST_REGEX_FI_WIN32_DIR
- #else
diff --git a/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch
deleted file mode 100644
index 1a00851fa92e..000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-OS_CYGWIN is used to assume cygpath, Win32-isms
-
---- boost_1_48_0/tools/build/src/engine/jam.h
-+++ boost_1_48_0/tools/build/src/engine/jam.h
-@@ -245,7 +245,6 @@
- #endif
- #if defined(__cygwin__) || defined(__CYGWIN__)
-     #define OSMINOR "OS=CYGWIN"
--    #define OS_CYGWIN
- #endif
- #if defined(__FreeBSD__) && !defined(__DragonFly__)
-     #define OSMINOR "OS=FREEBSD"
diff --git a/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch b/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch
deleted file mode 100644
index 4bc6ec9d36e1..000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/build/src/tools/python.jam	2012-04-25 22:35:55.000000000 -0500
-+++ b/tools/build/src/tools/python.jam	2013-01-21 07:22:30.814373200 -0600
-@@ -376,7 +376,7 @@ local rule path-to-native ( paths * )
- #
- local rule split-version ( version )
- {
--    local major-minor = [ MATCH ^([0-9]+)\.([0-9]+)(.*)$ : $(version) : 1 2 3 ] ;
-+    local major-minor = [ MATCH ^([0-9]+)\.([0-9]+[dmu]*)(.*)$ : $(version) : 1 2 3 ] ;
-     if ! $(major-minor[2]) || $(major-minor[3])
-     {
-         ECHO "Warning: \"using python\" expects a two part (major, minor) version number; got" $(version) instead ;
diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch
deleted file mode 100644
index 46308a59cb07..000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- boost_1_55_0/boost/asio/detail/socket_types.hpp	2014-08-31 12:43:54.186255800 -0500
-+++ boost_1_55_0/boost/asio/detail/socket_types.hpp	2014-08-31 12:43:03.887868700 -0500
-@@ -332,7 +332,11 @@ typedef int signed_size_type;
- # define BOOST_ASIO_OS_DEF_MSG_OOB MSG_OOB
- # define BOOST_ASIO_OS_DEF_MSG_PEEK MSG_PEEK
- # define BOOST_ASIO_OS_DEF_MSG_DONTROUTE MSG_DONTROUTE
-+#ifdef MSG_EOR
- # define BOOST_ASIO_OS_DEF_MSG_EOR MSG_EOR
-+#else
-+# define BOOST_ASIO_OS_DEF_MSG_EOR 0
-+#endif
- # define BOOST_ASIO_OS_DEF_SHUT_RD SHUT_RD
- # define BOOST_ASIO_OS_DEF_SHUT_WR SHUT_WR
- # define BOOST_ASIO_OS_DEF_SHUT_RDWR SHUT_RDWR
diff --git a/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch
deleted file mode 100644
index df3edf51e7b9..000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- boost_1_55_0/boost/detail/interlocked.hpp	2013-10-24 09:01:53.000000000 -0500
-+++ boost_1_55_0/boost/detail/interlocked.hpp	2014-08-31 13:01:33.830313500 -0500
-@@ -160,7 +160,7 @@ extern "C" void* __cdecl _InterlockedExc
-     ((void*)BOOST_INTERLOCKED_EXCHANGE((long volatile*)(dest),(long)(exchange)))
- # endif
- 
--#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )
-+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ )
- 
- #define BOOST_INTERLOCKED_IMPORT __declspec(dllimport)
- 
diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch
deleted file mode 100644
index 3702d475c8e9..000000000000
--- a/pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch
+++ /dev/null
@@ -1,1835 +0,0 @@
---- boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp	2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/buffer_sequence_adapter.hpp	2015-05-04 17:33:18.798985800 -0500
-@@ -42,7 +42,7 @@ protected:
-   BOOST_ASIO_DECL static void init_native_buffer(
-       native_buffer_type& buf,
-       const boost::asio::const_buffer& buffer);
--#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#elif defined(BOOST_ASIO_WINDOWS)
-   // The maximum number of buffers to support in a single operation.
-   enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len };
- 
-@@ -61,7 +61,7 @@ protected:
-     buf.buf = const_cast<char*>(boost::asio::buffer_cast<const char*>(buffer));
-     buf.len = static_cast<ULONG>(boost::asio::buffer_size(buffer));
-   }
--#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#else // defined(BOOST_ASIO_WINDOWS)
-   // The maximum number of buffers to support in a single operation.
-   enum { max_buffers = 64 < max_iov_len ? 64 : max_iov_len };
- 
-@@ -92,7 +92,7 @@ protected:
-           boost::asio::buffer_cast<const void*>(buffer)));
-     iov.iov_len = boost::asio::buffer_size(buffer);
-   }
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- };
- 
- // Helper class to translate buffers into the native buffer representation.
---- boost_1_57_0/boost/asio/detail/config.hpp	2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/config.hpp	2015-05-04 17:34:30.756623300 -0500
-@@ -474,7 +474,7 @@
- #endif // !defined(BOOST_ASIO_WINDOWS)
- 
- // Windows: target OS version.
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- # if !defined(_WIN32_WINNT) && !defined(_WIN32_WINDOWS)
- #  if defined(_MSC_VER) || defined(__BORLANDC__)
- #   pragma message( \
-@@ -512,29 +512,29 @@
- #   error You must add -D__USE_W32_SOCKETS to your compiler options.
- #  endif // !defined(__USE_W32_SOCKETS)
- # endif // defined(__CYGWIN__)
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- 
- // Windows: minimise header inclusion.
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- # if !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN)
- #  if !defined(WIN32_LEAN_AND_MEAN)
- #   define WIN32_LEAN_AND_MEAN
- #  endif // !defined(WIN32_LEAN_AND_MEAN)
- # endif // !defined(BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN)
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- 
- // Windows: suppress definition of "min" and "max" macros.
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- # if !defined(BOOST_ASIO_NO_NOMINMAX)
- #  if !defined(NOMINMAX)
- #   define NOMINMAX 1
- #  endif // !defined(NOMINMAX)
- # endif // !defined(BOOST_ASIO_NO_NOMINMAX)
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- 
- // Windows: IO Completion Ports.
- #if !defined(BOOST_ASIO_HAS_IOCP)
--# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# if defined(BOOST_ASIO_WINDOWS)
- #  if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400)
- #   if !defined(UNDER_CE)
- #    if !defined(BOOST_ASIO_DISABLE_IOCP)
-@@ -542,7 +542,7 @@
- #    endif // !defined(BOOST_ASIO_DISABLE_IOCP)
- #   endif // !defined(UNDER_CE)
- #  endif // defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400)
--# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# endif // defined(BOOST_ASIO_WINDOWS)
- #endif // !defined(BOOST_ASIO_HAS_IOCP)
- 
- // Linux: epoll, eventfd and timerfd.
-@@ -599,8 +599,7 @@
- #if !defined(BOOST_ASIO_HAS_SERIAL_PORT)
- # if defined(BOOST_ASIO_HAS_IOCP) \
-   || !defined(BOOST_ASIO_WINDOWS) \
--  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
--  && !defined(__CYGWIN__)
-+  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- #  if !defined(__SYMBIAN32__)
- #   if !defined(BOOST_ASIO_DISABLE_SERIAL_PORT)
- #    define BOOST_ASIO_HAS_SERIAL_PORT 1
-@@ -609,7 +608,6 @@
- # endif // defined(BOOST_ASIO_HAS_IOCP)
-         //   || !defined(BOOST_ASIO_WINDOWS)
-         //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
--        //   && !defined(__CYGWIN__)
- #endif // !defined(BOOST_ASIO_HAS_SERIAL_PORT)
- 
- // Windows: stream handles.
-@@ -633,11 +631,11 @@
- // Windows: object handles.
- #if !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE)
- # if !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE)
--#  if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#  if defined(BOOST_ASIO_WINDOWS)
- #   if !defined(UNDER_CE)
- #    define BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE 1
- #   endif // !defined(UNDER_CE)
--#  endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#  endif // defined(BOOST_ASIO_WINDOWS)
- # endif // !defined(BOOST_ASIO_DISABLE_WINDOWS_OBJECT_HANDLE)
- #endif // !defined(BOOST_ASIO_HAS_WINDOWS_OBJECT_HANDLE)
- 
-@@ -654,12 +652,10 @@
- #if !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR)
- # if !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR)
- #  if !defined(BOOST_ASIO_WINDOWS) \
--  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
--  && !defined(__CYGWIN__)
-+  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- #   define BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR 1
- #  endif // !defined(BOOST_ASIO_WINDOWS)
-          //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
--         //   && !defined(__CYGWIN__)
- # endif // !defined(BOOST_ASIO_DISABLE_POSIX_STREAM_DESCRIPTOR)
- #endif // !defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR)
- 
-@@ -667,12 +663,10 @@
- #if !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
- # if !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS)
- #  if !defined(BOOST_ASIO_WINDOWS) \
--  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
--  && !defined(__CYGWIN__)
-+  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- #   define BOOST_ASIO_HAS_LOCAL_SOCKETS 1
- #  endif // !defined(BOOST_ASIO_WINDOWS)
-          //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
--         //   && !defined(__CYGWIN__)
- # endif // !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS)
- #endif // !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
- 
-@@ -680,12 +674,10 @@
- #if !defined(BOOST_ASIO_HAS_SIGACTION)
- # if !defined(BOOST_ASIO_DISABLE_SIGACTION)
- #  if !defined(BOOST_ASIO_WINDOWS) \
--  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
--  && !defined(__CYGWIN__)
-+  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- #   define BOOST_ASIO_HAS_SIGACTION 1
- #  endif // !defined(BOOST_ASIO_WINDOWS)
-          //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
--         //   && !defined(__CYGWIN__)
- # endif // !defined(BOOST_ASIO_DISABLE_SIGACTION)
- #endif // !defined(BOOST_ASIO_HAS_SIGACTION)
- 
-@@ -700,7 +692,7 @@
- 
- // Can use getaddrinfo() and getnameinfo().
- #if !defined(BOOST_ASIO_HAS_GETADDRINFO)
--# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+# if defined(BOOST_ASIO_WINDOWS)
- #  if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501)
- #   define BOOST_ASIO_HAS_GETADDRINFO 1
- #  elif defined(UNDER_CE)
---- boost_1_57_0/boost/asio/detail/descriptor_ops.hpp	2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/descriptor_ops.hpp	2015-05-04 17:33:18.826989400 -0500
-@@ -18,8 +18,7 @@
- #include <boost/asio/detail/config.hpp>
- 
- #if !defined(BOOST_ASIO_WINDOWS) \
--  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
--  && !defined(__CYGWIN__)
-+  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- 
- #include <cstddef>
- #include <boost/system/error_code.hpp>
-@@ -114,6 +113,5 @@ BOOST_ASIO_DECL int poll_write(int d,
- 
- #endif // !defined(BOOST_ASIO_WINDOWS)
-        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
--       //   && !defined(__CYGWIN__)
- 
- #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_OPS_HPP
---- boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp	2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/descriptor_read_op.hpp	2015-05-04 17:33:18.830489800 -0500
-@@ -17,7 +17,7 @@
- 
- #include <boost/asio/detail/config.hpp>
- 
--#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#if !defined(BOOST_ASIO_WINDOWS)
- 
- #include <boost/asio/detail/addressof.hpp>
- #include <boost/asio/detail/bind_handler.hpp>
-@@ -116,6 +116,6 @@ private:
- 
- #include <boost/asio/detail/pop_options.hpp>
- 
--#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#endif // !defined(BOOST_ASIO_WINDOWS)
- 
- #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_READ_OP_HPP
---- boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp	2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/descriptor_write_op.hpp	2015-05-04 17:33:18.833490200 -0500
-@@ -17,7 +17,7 @@
- 
- #include <boost/asio/detail/config.hpp>
- 
--#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#if !defined(BOOST_ASIO_WINDOWS)
- 
- #include <boost/asio/detail/addressof.hpp>
- #include <boost/asio/detail/bind_handler.hpp>
-@@ -116,6 +116,6 @@ private:
- 
- #include <boost/asio/detail/pop_options.hpp>
- 
--#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#endif // !defined(BOOST_ASIO_WINDOWS)
- 
- #endif // BOOST_ASIO_DETAIL_DESCRIPTOR_WRITE_OP_HPP
---- boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp	2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/fd_set_adapter.hpp	2015-05-04 17:33:18.836490600 -0500
-@@ -26,7 +26,7 @@ namespace boost {
- namespace asio {
- namespace detail {
- 
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- typedef win_fd_set_adapter fd_set_adapter;
- #else
- typedef posix_fd_set_adapter fd_set_adapter;
---- boost_1_57_0/boost/asio/detail/hash_map.hpp	2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/hash_map.hpp	2015-05-04 17:33:18.839991000 -0500
-@@ -21,9 +21,9 @@
- #include <boost/asio/detail/assert.hpp>
- #include <boost/asio/detail/noncopyable.hpp>
- 
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- # include <boost/asio/detail/socket_types.hpp>
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- 
- #include <boost/asio/detail/push_options.hpp>
- 
-@@ -42,12 +42,12 @@ inline std::size_t calculate_hash_value(
-     + (reinterpret_cast<std::size_t>(p) >> 3);
- }
- 
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
- inline std::size_t calculate_hash_value(SOCKET s)
- {
-   return static_cast<std::size_t>(s);
- }
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- 
- // Note: assumes K and V are POD types.
- template <typename K, typename V>
---- boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp	2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/impl/descriptor_ops.ipp	2015-05-04 17:33:18.843491500 -0500
-@@ -21,8 +21,7 @@
- #include <boost/asio/error.hpp>
- 
- #if !defined(BOOST_ASIO_WINDOWS) \
--  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
--  && !defined(__CYGWIN__)
-+  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- 
- #include <boost/asio/detail/push_options.hpp>
- 
-@@ -448,6 +447,5 @@ int poll_write(int d, state_type state,
- 
- #endif // !defined(BOOST_ASIO_WINDOWS)
-        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
--       //   && !defined(__CYGWIN__)
- 
- #endif // BOOST_ASIO_DETAIL_IMPL_DESCRIPTOR_OPS_IPP
---- boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp	2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/impl/pipe_select_interrupter.ipp	2015-05-04 17:33:18.846991900 -0500
-@@ -19,7 +19,6 @@
- 
- #if !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- #if !defined(BOOST_ASIO_WINDOWS)
--#if !defined(__CYGWIN__)
- #if !defined(__SYMBIAN32__)
- #if !defined(BOOST_ASIO_HAS_EVENTFD)
- 
-@@ -119,7 +118,6 @@ bool pipe_select_interrupter::reset()
- 
- #endif // !defined(BOOST_ASIO_HAS_EVENTFD)
- #endif // !defined(__SYMBIAN32__)
--#endif // !defined(__CYGWIN__)
- #endif // !defined(BOOST_ASIO_WINDOWS)
- #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- 
---- boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp	2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/impl/reactive_descriptor_service.ipp	2015-05-04 17:33:18.849992300 -0500
-@@ -18,8 +18,7 @@
- #include <boost/asio/detail/config.hpp>
- 
- #if !defined(BOOST_ASIO_WINDOWS) \
--  && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \
--  && !defined(__CYGWIN__)
-+  && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
- 
- #include <boost/asio/error.hpp>
- #include <boost/asio/detail/reactive_descriptor_service.hpp>
-@@ -205,6 +204,5 @@ void reactive_descriptor_service::start_
- 
- #endif // !defined(BOOST_ASIO_WINDOWS)
-        //   && !defined(BOOST_ASIO_WINDOWS_RUNTIME)
--       //   && !defined(__CYGWIN__)
- 
- #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_DESCRIPTOR_SERVICE_IPP
---- boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp	2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/impl/reactive_serial_port_service.ipp	2015-05-04 17:33:18.853492700 -0500
-@@ -19,7 +19,7 @@
- #include <boost/asio/detail/config.hpp>
- 
- #if defined(BOOST_ASIO_HAS_SERIAL_PORT)
--#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#if !defined(BOOST_ASIO_WINDOWS)
- 
- #include <cstring>
- #include <boost/asio/detail/reactive_serial_port_service.hpp>
-@@ -147,7 +147,7 @@ boost::system::error_code reactive_seria
- 
- #include <boost/asio/detail/pop_options.hpp>
- 
--#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__)
-+#endif // !defined(BOOST_ASIO_WINDOWS)
- #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT)
- 
- #endif // BOOST_ASIO_DETAIL_IMPL_REACTIVE_SERIAL_PORT_SERVICE_IPP
---- boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp	2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/impl/select_reactor.ipp	2015-05-04 17:29:21.281324900 -0500
-@@ -187,7 +187,7 @@ void select_reactor::run(bool block, op_
-       max_fd = fd_sets_[i].max_descriptor();
-   }
- 
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
-   // Connection operations on Windows use both except and write fd_sets.
-   have_work_to_do = have_work_to_do || !op_queue_[connect_op].empty();
-   fd_sets_[write_op].set(op_queue_[connect_op], ops);
-@@ -196,7 +196,7 @@ void select_reactor::run(bool block, op_
-   fd_sets_[except_op].set(op_queue_[connect_op], ops);
-   if (fd_sets_[except_op].max_descriptor() > max_fd)
-     max_fd = fd_sets_[except_op].max_descriptor();
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- 
-   // We can return immediately if there's no work to do and the reactor is
-   // not supposed to block.
-@@ -226,11 +226,11 @@ void select_reactor::run(bool block, op_
-   // Dispatch all ready operations.
-   if (retval > 0)
-   {
--#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_ASIO_WINDOWS)
-     // Connection operations on Windows use both except and write fd_sets.
-     fd_sets_[except_op].perform(op_queue_[connect_op], ops);
-     fd_sets_[write_op].perform(op_queue_[connect_op], ops);
--#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
-+#endif // defined(BOOST_ASIO_WINDOWS)
- 
-     // Exception operations must be processed first to ensure that any
-     // out-of-band data is read before normal data.
---- boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp	2014-10-17 17:49:08.000000000 -0500
-+++ boost_1_57_0/boost/asio/detail/impl/signal_set_service.ipp	2015-05-04 17:33:18.857993300 -0500
-@@ -60,12 +60,10 @@ signal_state* get_signal_state()
- void boost_asio_signal_handler(int signal_number)
- {
- #if defined(BOOST_ASIO_WINDOWS) \
--  || defined(BOOST_ASIO_WINDOWS_RUNTIME) \
--  || defined(__CYGWIN__)
-+  || defined(BOOST_ASIO_WINDOWS_RUNTIME)
-   signal_set_service::deliver_signal(signal_number);
- #else // defined(BOOST_ASIO_WINDOWS)
-       //   || defined(BOOST_ASIO_WINDOWS_RUNTIME)