From a3ac12aca9c7d7be41c6af125f8b08d657e46f12 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Apr 2019 22:18:30 -0400 Subject: [PATCH 1/3] boost: remove old cygwin patches Most of these are unused and the others only used in 1.59. --- pkgs/development/libraries/boost/1.59.nix | 30 - .../boost/cygwin-1.40.0-cstdint-cygwin.patch | 20 - .../cygwin-1.40.0-iostreams-cygwin.patch | 24 - .../boost/cygwin-1.40.0-python-cygwin.patch | 35 - .../boost/cygwin-1.40.0-regex-cygwin.patch | 15 - .../boost/cygwin-1.45.0-jam-cygwin.patch | 12 - .../boost/cygwin-1.50.0-jam-pep3149.patch | 11 - .../boost/cygwin-1.55.0-asio-MSG_EOR.patch | 14 - .../cygwin-1.55.0-interlocked-cygwin.patch | 11 - .../boost/cygwin-1.57.0-asio-cygwin.patch | 1835 ----------------- .../boost/cygwin-1.57.0-config-cygwin.patch | 76 - .../boost/cygwin-1.57.0-context-cygwin.patch | 600 ------ .../cygwin-1.57.0-filesystem-cygwin.patch | 32 - .../boost/cygwin-1.57.0-locale-cygwin.patch | 81 - .../boost/cygwin-1.57.0-log-cygwin.patch | 46 - .../cygwin-1.57.0-smart_ptr-cygwin.patch | 77 - .../boost/cygwin-1.57.0-system-cygwin.patch | 22 - ...dora-boost-1.50.0-fix-non-utf8-files.patch | 22 - .../cygwin-fedora-boost-1.50.0-pool.patch | 122 -- ...a-boost-1.54.0-locale-unused_typedef.patch | 11 - ...-boost-1.54.0-pool-max_chunks_shadow.patch | 14 - ...a-boost-1.54.0-python-unused_typedef.patch | 15 - ...in-fedora-boost-1.57.0-move-is_class.patch | 20 - ...cygwin-fedora-boost-1.57.0-mpl-print.patch | 31 - ...edora-boost-1.57.0-pool-test_linking.patch | 33 - ...edora-boost-1.57.0-signals2-weak_ptr.patch | 10 - ...a-boost-1.57.0-spirit-unused_typedef.patch | 19 - ...-fedora-boost-1.57.0-uuid-comparison.patch | 11 - 28 files changed, 3249 deletions(-) delete mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-cstdint-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-iostreams-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-python-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.40.0-regex-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.45.0-jam-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.50.0-jam-pep3149.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.55.0-asio-MSG_EOR.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.55.0-interlocked-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-asio-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch delete mode 100644 pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix index 603d7883c64..f4931dfe547 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 61791c60d9e..00000000000 --- 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 - # else - # include -- --// 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 6641ba823b1..00000000000 --- 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 7932b0e124b..00000000000 --- 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 969bb814bd1..00000000000 --- 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 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 1a00851fa92..00000000000 --- 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 4bc6ec9d36e..00000000000 --- 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 46308a59cb0..00000000000 --- 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 df3edf51e7b..00000000000 --- 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 3702d475c8e..00000000000 --- 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(boost::asio::buffer_cast(buffer)); - buf.len = static_cast(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(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 - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include - #include -@@ -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 - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -116,6 +116,6 @@ private: - - #include - --#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 - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -116,6 +116,6 @@ private: - - #include - --#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 - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # include --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #include - -@@ -42,12 +42,12 @@ inline std::size_t calculate_hash_value( - + (reinterpret_cast(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(s); - } --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Note: assumes K and V are POD types. - template ---- 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 - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include - -@@ -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 - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include - #include -@@ -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 - - #if defined(BOOST_ASIO_HAS_SERIAL_PORT) --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -147,7 +147,7 @@ boost::system::error_code reactive_seria - - #include - --#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) -- // || defined(__CYGWIN__) - int saved_errno = errno; - signal_state* state = get_signal_state(); - signed_size_type result = ::write(state->write_descriptor_, -@@ -74,7 +72,6 @@ void boost_asio_signal_handler(int signa - errno = saved_errno; - #endif // defined(BOOST_ASIO_WINDOWS) - // || defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // || defined(__CYGWIN__) - - #if defined(BOOST_ASIO_HAS_SIGNAL) && !defined(BOOST_ASIO_HAS_SIGACTION) - ::signal(signal_number, boost_asio_signal_handler); -@@ -82,8 +79,7 @@ void boost_asio_signal_handler(int signa - } - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - class signal_set_service::pipe_read_op : public reactor_op - { - public: -@@ -115,30 +111,25 @@ public: - }; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - signal_set_service::signal_set_service( - boost::asio::io_service& io_service) - : io_service_(boost::asio::use_service(io_service)), - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - reactor_(boost::asio::use_service(io_service)), - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - next_(0), - prev_(0) - { - get_signal_state()->mutex_.init(); - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - reactor_.init_task(); - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - for (int i = 0; i < max_signal_number; ++i) - registrations_[i] = 0; -@@ -174,8 +165,7 @@ void signal_set_service::fork_service( - boost::asio::io_service::fork_event fork_ev) - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - signal_state* state = get_signal_state(); - static_mutex::scoped_lock lock(state->mutex_); - -@@ -217,11 +207,9 @@ void signal_set_service::fork_service( - } - #else // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - (void)fork_ev; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::construct( -@@ -281,12 +269,12 @@ boost::system::error_code signal_set_ser - if (::signal(signal_number, boost_asio_signal_handler) == SIG_ERR) - # endif // defined(BOOST_ASIO_HAS_SIGACTION) - { --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - ec = boost::asio::error::invalid_argument; --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(errno, - boost::asio::error::get_system_category()); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - delete new_registration; - return ec; - } -@@ -351,12 +339,12 @@ boost::system::error_code signal_set_ser - if (::signal(signal_number, SIG_DFL) == SIG_ERR) - # endif // defined(BOOST_ASIO_HAS_SIGACTION) - { --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - ec = boost::asio::error::invalid_argument; --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(errno, - boost::asio::error::get_system_category()); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - return ec; - } - } -@@ -405,12 +393,12 @@ boost::system::error_code signal_set_ser - if (::signal(reg->signal_number_, SIG_DFL) == SIG_ERR) - # endif // defined(BOOST_ASIO_HAS_SIGACTION) - { --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - ec = boost::asio::error::invalid_argument; --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(errno, - boost::asio::error::get_system_category()); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - return ec; - } - } -@@ -500,11 +488,11 @@ void signal_set_service::add_service(sig - signal_state* state = get_signal_state(); - static_mutex::scoped_lock lock(state->mutex_); - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - // If this is the first service to be created, open a new pipe. - if (state->service_list_ == 0) - open_descriptors(); --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - // Insert service into linked list of all services. - service->next_ = state->service_list_; -@@ -514,8 +502,7 @@ void signal_set_service::add_service(sig - state->service_list_ = service; - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - // Register for pipe readiness notifications. - int read_descriptor = state->read_descriptor_; - lock.unlock(); -@@ -523,7 +510,6 @@ void signal_set_service::add_service(sig - read_descriptor, service->reactor_data_, new pipe_read_op); - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::remove_service(signal_set_service* service) -@@ -534,8 +520,7 @@ void signal_set_service::remove_service( - if (service->next_ || service->prev_ || state->service_list_ == service) - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - // Disable the pipe readiness notifications. - int read_descriptor = state->read_descriptor_; - lock.unlock(); -@@ -544,7 +529,6 @@ void signal_set_service::remove_service( - lock.lock(); - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - // Remove service from linked list of all services. - if (state->service_list_ == service) -@@ -556,19 +540,18 @@ void signal_set_service::remove_service( - service->next_ = 0; - service->prev_ = 0; - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - // If this is the last service to be removed, close the pipe. - if (state->service_list_ == 0) - close_descriptors(); --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - } - } - - void signal_set_service::open_descriptors() - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - signal_state* state = get_signal_state(); - - int pipe_fds[2]; -@@ -593,14 +576,12 @@ void signal_set_service::open_descriptor - } - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::close_descriptors() - { - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - signal_state* state = get_signal_state(); - - if (state->read_descriptor_ != -1) -@@ -612,7 +593,6 @@ void signal_set_service::close_descripto - state->write_descriptor_ = -1; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - } - - void signal_set_service::start_wait_op( ---- boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/socket_ops.ipp 2015-05-04 17:32:20.048025400 -0500 -@@ -33,12 +33,12 @@ - # include - #endif // defined(BOOST_ASIO_WINDOWS_RUNTIME) - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) \ -+#if defined(BOOST_ASIO_WINDOWS) \ - || defined(__MACH__) && defined(__APPLE__) - # if defined(BOOST_ASIO_HAS_PTHREADS) - # include - # endif // defined(BOOST_ASIO_HAS_PTHREADS) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - // || defined(__MACH__) && defined(__APPLE__) - - #include -@@ -50,9 +50,9 @@ namespace socket_ops { - - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - struct msghdr { int msg_namelen; }; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #if defined(__hpux) - // HP-UX doesn't declare these functions extern "C", so they are declared again -@@ -65,7 +65,7 @@ extern "C" unsigned int if_nametoindex(c - - inline void clear_last_error() - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - WSASetLastError(0); - #else - errno = 0; -@@ -78,7 +78,7 @@ template - inline ReturnType error_wrapper(ReturnType return_value, - boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ec = boost::system::error_code(WSAGetLastError(), - boost::asio::error::get_system_category()); - #else -@@ -313,11 +313,11 @@ int close(socket_type s, state_type& sta - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::closesocket(s), ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::close(s), ec); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - if (result != 0 - && (ec == boost::asio::error::would_block -@@ -329,10 +329,10 @@ int close(socket_type s, state_type& sta - // current OS where this behaviour is seen, Windows, says that the socket - // remains open. Therefore we'll put the descriptor back into blocking - // mode and have another attempt at closing it. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ioctl_arg_type arg = 0; - ::ioctlsocket(s, FIONBIO, &arg); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - # if defined(__SYMBIAN32__) - int flags = ::fcntl(s, F_GETFL, 0); - if (flags >= 0) -@@ -341,15 +341,15 @@ int close(socket_type s, state_type& sta - ioctl_arg_type arg = 0; - ::ioctl(s, FIONBIO, &arg); - # endif // defined(__SYMBIAN32__) --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - state &= ~non_blocking; - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::closesocket(s), ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - result = error_wrapper(::close(s), ec); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - } - -@@ -368,7 +368,7 @@ bool set_user_non_blocking(socket_type s - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ioctl_arg_type arg = (value ? 1 : 0); - int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec); - #elif defined(__SYMBIAN32__) -@@ -421,7 +421,7 @@ bool set_internal_non_blocking(socket_ty - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - ioctl_arg_type arg = (value ? 1 : 0); - int result = error_wrapper(::ioctlsocket(s, FIONBIO, &arg), ec); - #elif defined(__SYMBIAN32__) -@@ -543,7 +543,6 @@ bool non_blocking_connect(socket_type s, - // Check if the connect operation has finished. This is required since we may - // get spurious readiness notifications from the reactor. - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set write_fds; - FD_ZERO(&write_fds); -@@ -556,7 +555,6 @@ bool non_blocking_connect(socket_type s, - zero_timeout.tv_usec = 0; - int ready = ::select(s + 1, 0, &write_fds, &except_fds, &zero_timeout); - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -564,7 +562,6 @@ bool non_blocking_connect(socket_type s, - fds.revents = 0; - int ready = ::poll(&fds, 1, 0); - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - if (ready == 0) - { -@@ -593,7 +590,7 @@ bool non_blocking_connect(socket_type s, - int socketpair(int af, int type, int protocol, - socket_type sv[2], boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - (void)(af); - (void)(type); - (void)(protocol); -@@ -619,11 +616,11 @@ bool sockatmark(socket_type s, boost::sy - - #if defined(SIOCATMARK) - ioctl_arg_type value = 0; --# if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# if defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctlsocket(s, SIOCATMARK, &value), ec); --# else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# else // defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctl(s, SIOCATMARK, &value), ec); --# endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+# endif // defined(BOOST_ASIO_WINDOWS) - if (result == 0) - ec = boost::system::error_code(); - # if defined(ENOTTY) -@@ -648,11 +645,11 @@ size_t available(socket_type s, boost::s - } - - ioctl_arg_type value = 0; --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctlsocket(s, FIONREAD, &value), ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctl(s, FIONREAD, &value), ec); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - if (result == 0) - ec = boost::system::error_code(); - #if defined(ENOTTY) -@@ -689,32 +686,32 @@ inline void init_buf_iov_base(T& base, v - base = static_cast(addr); - } - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - typedef WSABUF buf; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - typedef iovec buf; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - void init_buf(buf& b, void* data, size_t size) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - b.buf = static_cast(data); - b.len = static_cast(size); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - init_buf_iov_base(b.iov_base, data); - b.iov_len = size; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - void init_buf(buf& b, const void* data, size_t size) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - b.buf = static_cast(const_cast(data)); - b.len = static_cast(size); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - init_buf_iov_base(b.iov_base, const_cast(data)); - b.iov_len = size; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - inline void init_msghdr_msg_name(void*& name, socket_addr_type* addr) -@@ -743,7 +740,7 @@ signed_size_type recv(socket_type s, buf - int flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Receive some data. - DWORD recv_buf_count = static_cast(count); - DWORD bytes_transferred = 0; -@@ -758,7 +755,7 @@ signed_size_type recv(socket_type s, buf - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - msg.msg_iov = bufs; - msg.msg_iovlen = static_cast(count); -@@ -766,7 +763,7 @@ signed_size_type recv(socket_type s, buf - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_recv(socket_type s, state_type state, buf* bufs, -@@ -889,7 +886,7 @@ signed_size_type recvfrom(socket_type s, - boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Receive some data. - DWORD recv_buf_count = static_cast(count); - DWORD bytes_transferred = 0; -@@ -906,7 +903,7 @@ signed_size_type recvfrom(socket_type s, - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - init_msghdr_msg_name(msg.msg_name, addr); - msg.msg_namelen = static_cast(*addrlen); -@@ -917,7 +914,7 @@ signed_size_type recvfrom(socket_type s, - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_recvfrom(socket_type s, state_type state, buf* bufs, -@@ -1014,10 +1011,10 @@ signed_size_type recvmsg(socket_type s, - int in_flags, int& out_flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - out_flags = 0; - return socket_ops::recv(s, bufs, count, in_flags, ec); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - msg.msg_iov = bufs; - msg.msg_iovlen = static_cast(count); -@@ -1030,7 +1027,7 @@ signed_size_type recvmsg(socket_type s, - else - out_flags = 0; - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_recvmsg(socket_type s, state_type state, -@@ -1126,7 +1123,7 @@ signed_size_type send(socket_type s, con - int flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Send the data. - DWORD send_buf_count = static_cast(count); - DWORD bytes_transferred = 0; -@@ -1141,7 +1138,7 @@ signed_size_type send(socket_type s, con - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - msg.msg_iov = const_cast(bufs); - msg.msg_iovlen = static_cast(count); -@@ -1152,7 +1149,7 @@ signed_size_type send(socket_type s, con - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_send(socket_type s, state_type state, const buf* bufs, -@@ -1253,7 +1250,7 @@ signed_size_type sendto(socket_type s, c - boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - // Send the data. - DWORD send_buf_count = static_cast(count); - DWORD bytes_transferred = 0; -@@ -1268,7 +1265,7 @@ signed_size_type sendto(socket_type s, c - return socket_error_retval; - ec = boost::system::error_code(); - return bytes_transferred; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - msghdr msg = msghdr(); - init_msghdr_msg_name(msg.msg_name, addr); - msg.msg_namelen = static_cast(addrlen); -@@ -1281,7 +1278,7 @@ signed_size_type sendto(socket_type s, c - if (result >= 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - size_t sync_sendto(socket_type s, state_type state, const buf* bufs, -@@ -1358,7 +1355,7 @@ socket_type socket(int af, int type, int - boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - socket_type s = error_wrapper(::WSASocketW(af, type, protocol, 0, 0, - WSA_FLAG_OVERLAPPED), ec); - if (s == invalid_socket) -@@ -1556,7 +1553,7 @@ int getsockopt(socket_type s, state_type - } - ec = boost::asio::error::fault; - return socket_error_retval; --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - clear_last_error(); - int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen, - s, level, optname, optval, optlen), ec); -@@ -1574,7 +1571,7 @@ int getsockopt(socket_type s, state_type - if (result == 0) - ec = boost::system::error_code(); - return result; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - clear_last_error(); - int result = error_wrapper(call_getsockopt(&msghdr::msg_namelen, - s, level, optname, optval, optlen), ec); -@@ -1593,7 +1590,7 @@ int getsockopt(socket_type s, state_type - if (result == 0) - ec = boost::system::error_code(); - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - template -@@ -1615,7 +1612,7 @@ int getpeername(socket_type s, socket_ad - return socket_error_retval; - } - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (cached) - { - // Check if socket is still connected. -@@ -1636,9 +1633,9 @@ int getpeername(socket_type s, socket_ad - ec = boost::system::error_code(); - return 0; - } --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - (void)cached; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - clear_last_error(); - int result = error_wrapper(call_getpeername( -@@ -1685,7 +1682,7 @@ int ioctl(socket_type s, state_type& sta - } - - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::ioctlsocket(s, cmd, arg), ec); - #elif defined(__MACH__) && defined(__APPLE__) \ - || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) -@@ -1726,7 +1723,7 @@ int select(int nfds, fd_set* readfds, fd - fd_set* exceptfds, timeval* timeout, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (!readfds && !writefds && !exceptfds && timeout) - { - DWORD milliseconds = timeout->tv_sec * 1000 + timeout->tv_usec / 1000; -@@ -1746,7 +1743,7 @@ int select(int nfds, fd_set* readfds, fd - if (timeout && timeout->tv_sec == 0 - && timeout->tv_usec > 0 && timeout->tv_usec < 1000) - timeout->tv_usec = 1000; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #if defined(__hpux) && defined(__SELECT) - timespec ts; -@@ -1772,7 +1769,6 @@ int poll_read(socket_type s, state_type - } - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set fds; - FD_ZERO(&fds); -@@ -1784,7 +1780,6 @@ int poll_read(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::select(s + 1, &fds, 0, 0, timeout), ec); - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -1794,7 +1789,6 @@ int poll_read(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::poll(&fds, 1, timeout), ec); - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - if (result == 0) - ec = (state & user_set_non_blocking) -@@ -1813,7 +1807,6 @@ int poll_write(socket_type s, state_type - } - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set fds; - FD_ZERO(&fds); -@@ -1825,7 +1818,6 @@ int poll_write(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::select(s + 1, 0, &fds, 0, timeout), ec); - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -1835,7 +1827,6 @@ int poll_write(socket_type s, state_type - clear_last_error(); - int result = error_wrapper(::poll(&fds, 1, timeout), ec); - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - if (result == 0) - ec = (state & user_set_non_blocking) -@@ -1854,7 +1845,6 @@ int poll_connect(socket_type s, boost::s - } - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - fd_set write_fds; - FD_ZERO(&write_fds); -@@ -1869,7 +1859,6 @@ int poll_connect(socket_type s, boost::s - ec = boost::system::error_code(); - return result; - #else // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - pollfd fds; - fds.fd = s; -@@ -1881,7 +1870,6 @@ int poll_connect(socket_type s, boost::s - ec = boost::system::error_code(); - return result; - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - } - -@@ -1926,7 +1914,7 @@ const char* inet_ntop(int af, const void - ec = boost::asio::error::address_family_not_supported; - return 0; - } --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - using namespace std; // For memcpy. - - if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6)) -@@ -1981,7 +1969,7 @@ const char* inet_ntop(int af, const void - ec = boost::asio::error::invalid_argument; - - return result == socket_error_retval ? 0 : dest; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - const char* result = error_wrapper(::inet_ntop( - af, src, dest, static_cast(length)), ec); - if (result == 0 && !ec) -@@ -2001,7 +1989,7 @@ const char* inet_ntop(int af, const void - strcat(dest, if_name); - } - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - int inet_pton(int af, const char* src, void* dest, -@@ -2152,7 +2140,7 @@ int inet_pton(int af, const char* src, v - ec = boost::asio::error::address_family_not_supported; - return -1; - } --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - using namespace std; // For memcpy and strcmp. - - if (af != BOOST_ASIO_OS_DEF(AF_INET) && af != BOOST_ASIO_OS_DEF(AF_INET6)) -@@ -2212,7 +2200,7 @@ int inet_pton(int af, const char* src, v - ec = boost::system::error_code(); - - return result == socket_error_retval ? -1 : 1; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - int result = error_wrapper(::inet_pton(af, src, dest), ec); - if (result <= 0 && !ec) - ec = boost::asio::error::invalid_argument; -@@ -2234,7 +2222,7 @@ int inet_pton(int af, const char* src, v - } - } - return result; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - int gethostname(char* name, int namelen, boost::system::error_code& ec) -@@ -2310,7 +2298,7 @@ inline hostent* gethostbyaddr(const char - hostent* result, char* buffer, int buflength, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - (void)(buffer); - (void)(buflength); - hostent* retval = error_wrapper(::gethostbyaddr(addr, length, af), ec); -@@ -2353,7 +2341,7 @@ inline hostent* gethostbyname(const char - char* buffer, int buflength, int ai_flags, boost::system::error_code& ec) - { - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - (void)(buffer); - (void)(buflength); - (void)(ai_flags); -@@ -3153,7 +3141,7 @@ inline boost::system::error_code transla - case EAI_SOCKTYPE: - return boost::asio::error::socket_type_not_supported; - default: // Possibly the non-portable EAI_SYSTEM. --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - return boost::system::error_code( - WSAGetLastError(), boost::asio::error::get_system_category()); - #else -@@ -3170,7 +3158,7 @@ boost::system::error_code getaddrinfo(co - host = (host && *host) ? host : 0; - service = (service && *service) ? service : 0; - clear_last_error(); --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if defined(BOOST_ASIO_HAS_GETADDRINFO) - // Building for Windows XP, Windows Server 2003, or later. - int error = ::getaddrinfo(host, service, &hints, result); -@@ -3213,7 +3201,7 @@ boost::system::error_code background_get - - void freeaddrinfo(addrinfo_type* ai) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if defined(BOOST_ASIO_HAS_GETADDRINFO) - // Building for Windows XP, Windows Server 2003, or later. - ::freeaddrinfo(ai); -@@ -3241,7 +3229,7 @@ boost::system::error_code getnameinfo(co - std::size_t addrlen, char* host, std::size_t hostlen, - char* serv, std::size_t servlen, int flags, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # if defined(BOOST_ASIO_HAS_GETADDRINFO) - // Building for Windows XP, Windows Server 2003, or later. - clear_last_error(); ---- boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/socket_select_interrupter.ipp 2015-05-04 17:33:18.861493700 -0500 -@@ -20,7 +20,6 @@ - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - - #include -@@ -169,7 +168,6 @@ bool socket_select_interrupter::reset() - #include - - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - - #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) ---- boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/impl/winsock_init.ipp 2015-05-04 17:33:18.864494100 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -79,6 +79,6 @@ void winsock_init_base::throw_on_error(d - - #include - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_IMPL_WINSOCK_INIT_IPP ---- boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/local_free_on_block_exit.hpp 2015-05-04 17:33:18.867994600 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -54,6 +54,6 @@ private: - - #include - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_LOCAL_FREE_ON_BLOCK_EXIT_HPP ---- boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/null_signal_blocker.hpp 2015-05-04 17:33:18.870994900 -0500 -@@ -20,7 +20,6 @@ - #if !defined(BOOST_ASIO_HAS_THREADS) \ - || defined(BOOST_ASIO_WINDOWS) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - - #include -@@ -65,7 +64,6 @@ public: - #endif // !defined(BOOST_ASIO_HAS_THREADS) - // || defined(BOOST_ASIO_WINDOWS) - // || defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - - #endif // BOOST_ASIO_DETAIL_NULL_SIGNAL_BLOCKER_HPP ---- boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/old_win_sdk_compat.hpp 2015-05-04 17:33:18.874495400 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - // Guess whether we are building against on old Platform SDK. - #if !defined(IN6ADDR_ANY_INIT) -@@ -211,6 +211,6 @@ struct addrinfo_emulation - # define IPPROTO_ICMPV6 58 - #endif - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_OLD_WIN_SDK_COMPAT_HPP ---- boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/pipe_select_interrupter.hpp 2015-05-04 17:33:18.877995800 -0500 -@@ -19,7 +19,6 @@ - - #if !defined(BOOST_ASIO_WINDOWS) - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) --#if !defined(__CYGWIN__) - #if !defined(__SYMBIAN32__) - #if !defined(BOOST_ASIO_HAS_EVENTFD) - -@@ -84,7 +83,6 @@ private: - - #endif // !defined(BOOST_ASIO_HAS_EVENTFD) - #endif // !defined(__SYMBIAN32__) --#endif // !defined(__CYGWIN__) - #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) - #endif // !defined(BOOST_ASIO_WINDOWS) - ---- boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/posix_fd_set_adapter.hpp 2015-05-04 17:33:18.881496300 -0500 -@@ -18,7 +18,6 @@ - #include - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(__CYGWIN__) \ - && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include -@@ -114,7 +113,6 @@ private: - #include - - #endif // !defined(BOOST_ASIO_WINDOWS) -- // && !defined(__CYGWIN__) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #endif // BOOST_ASIO_DETAIL_POSIX_FD_SET_ADAPTER_HPP ---- boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/reactive_descriptor_service.hpp 2015-05-04 17:33:18.886496900 -0500 -@@ -18,8 +18,7 @@ - #include - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #include - #include -@@ -319,6 +318,5 @@ private: - - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - #endif // BOOST_ASIO_DETAIL_REACTIVE_DESCRIPTOR_SERVICE_HPP ---- boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/reactive_serial_port_service.hpp 2015-05-04 17:33:18.889497300 -0500 -@@ -19,7 +19,7 @@ - #include - - #if defined(BOOST_ASIO_HAS_SERIAL_PORT) --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -230,7 +230,7 @@ private: - # include - #endif // defined(BOOST_ASIO_HEADER_ONLY) - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT) - - #endif // BOOST_ASIO_DETAIL_REACTIVE_SERIAL_PORT_SERVICE_HPP ---- boost_1_57_0/boost/asio/detail/select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/select_interrupter.hpp 2015-05-04 17:33:18.892497700 -0500 -@@ -19,7 +19,7 @@ - - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__) - # include - #elif defined(BOOST_ASIO_HAS_EVENTFD) - # include -@@ -31,7 +31,7 @@ namespace boost { - namespace asio { - namespace detail { - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+#if defined(BOOST_ASIO_WINDOWS) || defined(__SYMBIAN32__) - typedef socket_select_interrupter select_interrupter; - #elif defined(BOOST_ASIO_HAS_EVENTFD) - typedef eventfd_select_interrupter select_interrupter; ---- boost_1_57_0/boost/asio/detail/select_reactor.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/select_reactor.hpp 2015-05-04 17:33:18.895498100 -0500 -@@ -51,13 +51,13 @@ class select_reactor - : public boost::asio::detail::service_base - { - public: --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - enum op_types { read_op = 0, write_op = 1, except_op = 2, - max_select_ops = 3, connect_op = 3, max_ops = 4 }; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - enum op_types { read_op = 0, write_op = 1, except_op = 2, - max_select_ops = 3, connect_op = 1, max_ops = 3 }; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - // Per-descriptor data. - struct per_descriptor_data ---- boost_1_57_0/boost/asio/detail/signal_blocker.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/signal_blocker.hpp 2015-05-04 17:33:18.898498400 -0500 -@@ -19,7 +19,7 @@ - - #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+ || defined(__SYMBIAN32__) - # include - #elif defined(BOOST_ASIO_HAS_PTHREADS) - # include -@@ -33,7 +33,7 @@ namespace detail { - - #if !defined(BOOST_ASIO_HAS_THREADS) || defined(BOOST_ASIO_WINDOWS) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- || defined(__CYGWIN__) || defined(__SYMBIAN32__) -+ || defined(__SYMBIAN32__) - typedef null_signal_blocker signal_blocker; - #elif defined(BOOST_ASIO_HAS_PTHREADS) - typedef posix_signal_blocker signal_blocker; ---- boost_1_57_0/boost/asio/detail/signal_init.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/signal_init.hpp 2015-05-04 17:33:18.901998900 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - #include - -@@ -44,6 +44,6 @@ public: - - #include - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_SIGNAL_INIT_HPP ---- boost_1_57_0/boost/asio/detail/signal_set_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/signal_set_service.hpp 2015-05-04 17:33:18.904999300 -0500 -@@ -28,9 +28,9 @@ - #include - #include - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - # include --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #include - -@@ -183,8 +183,7 @@ private: - io_service_impl& io_service_; - - #if !defined(BOOST_ASIO_WINDOWS) \ -- && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ -- && !defined(__CYGWIN__) -+ && !defined(BOOST_ASIO_WINDOWS_RUNTIME) - // The type used for registering for pipe reactor notifications. - class pipe_read_op; - -@@ -195,7 +194,6 @@ private: - reactor::per_descriptor_data reactor_data_; - #endif // !defined(BOOST_ASIO_WINDOWS) - // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) -- // && !defined(__CYGWIN__) - - // A mapping from signal number to the registered signal sets. - registration* registrations_[max_signal_number]; ---- boost_1_57_0/boost/asio/detail/socket_ops.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/socket_ops.hpp 2015-05-04 17:33:18.907999600 -0500 -@@ -128,11 +128,11 @@ BOOST_ASIO_DECL size_t available(socket_ - BOOST_ASIO_DECL int listen(socket_type s, - int backlog, boost::system::error_code& ec); - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - typedef WSABUF buf; --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - typedef iovec buf; --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - BOOST_ASIO_DECL void init_buf(buf& b, void* data, size_t size); - ---- boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/socket_select_interrupter.hpp 2015-05-04 17:33:18.912500200 -0500 -@@ -20,7 +20,6 @@ - #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) - - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(__SYMBIAN32__) - - #include -@@ -85,7 +84,6 @@ private: - #endif // defined(BOOST_ASIO_HEADER_ONLY) - - #endif // defined(BOOST_ASIO_WINDOWS) -- // || defined(__CYGWIN__) - // || defined(__SYMBIAN32__) - - #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) ---- boost_1_57_0/boost/asio/detail/socket_types.hpp 2015-05-04 17:16:30.021887400 -0500 -+++ boost_1_57_0/boost/asio/detail/socket_types.hpp 2015-05-04 17:33:18.915500600 -0500 -@@ -19,7 +19,7 @@ - - #if defined(BOOST_ASIO_WINDOWS_RUNTIME) - // Empty. --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # if defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_) - # error WinSock.h has already been included - # endif // defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_) -@@ -169,7 +169,7 @@ typedef int signed_size_type; - # define BOOST_ASIO_OS_DEF_AI_V4MAPPED 0x800 - # define BOOST_ASIO_OS_DEF_AI_ALL 0x100 - # define BOOST_ASIO_OS_DEF_AI_ADDRCONFIG 0x400 --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - typedef SOCKET socket_type; - const SOCKET invalid_socket = INVALID_SOCKET; - const int socket_error_retval = SOCKET_ERROR; ---- boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/win_fd_set_adapter.hpp 2015-05-04 17:33:18.919001000 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include - #include -@@ -146,6 +146,6 @@ private: - - #include - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_WIN_FD_SET_ADAPTER_HPP ---- boost_1_57_0/boost/asio/detail/winsock_init.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/detail/winsock_init.hpp 2015-05-04 17:33:18.923501600 -0500 -@@ -17,7 +17,7 @@ - - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - - #include - -@@ -125,6 +125,6 @@ static const winsock_init<>& winsock_ini - # include - #endif // defined(BOOST_ASIO_HEADER_ONLY) - --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - - #endif // BOOST_ASIO_DETAIL_WINSOCK_INIT_HPP ---- boost_1_57_0/boost/asio/error.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/error.hpp 2015-05-04 17:33:18.926502000 -0500 -@@ -20,7 +20,6 @@ - #include - #include - #if defined(BOOST_ASIO_WINDOWS) \ -- || defined(__CYGWIN__) \ - || defined(BOOST_ASIO_WINDOWS_RUNTIME) - # include - #else -@@ -45,7 +44,7 @@ - # define BOOST_ASIO_NETDB_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e) - # define BOOST_ASIO_GETADDRINFO_ERROR(e) __HRESULT_FROM_WIN32(WSA ## e) - # define BOOST_ASIO_WIN_OR_POSIX(e_win, e_posix) e_win --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # define BOOST_ASIO_NATIVE_ERROR(e) e - # define BOOST_ASIO_SOCKET_ERROR(e) WSA ## e - # define BOOST_ASIO_NETDB_ERROR(e) WSA ## e -@@ -225,7 +224,7 @@ inline const boost::system::error_catego - return boost::system::system_category(); - } - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - extern BOOST_ASIO_DECL - const boost::system::error_category& get_netdb_category(); -@@ -233,7 +232,7 @@ const boost::system::error_category& get - extern BOOST_ASIO_DECL - const boost::system::error_category& get_addrinfo_category(); - --#else // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#else // !defined(BOOST_ASIO_WINDOWS) - - inline const boost::system::error_category& get_netdb_category() - { -@@ -245,7 +244,7 @@ inline const boost::system::error_catego - return get_system_category(); - } - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - extern BOOST_ASIO_DECL - const boost::system::error_category& get_misc_category(); ---- boost_1_57_0/boost/asio/impl/error.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/impl/error.ipp 2015-05-04 17:33:18.931002600 -0500 -@@ -25,7 +25,7 @@ namespace boost { - namespace asio { - namespace error { - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - - namespace detail { - -@@ -87,7 +87,7 @@ const boost::system::error_category& get - return instance; - } - --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - namespace detail { - ---- boost_1_57_0/boost/asio/impl/serial_port_base.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/impl/serial_port_base.ipp 2015-05-04 17:33:18.936503300 -0500 -@@ -27,7 +27,7 @@ - - #if defined(GENERATING_DOCUMENTATION) - # define BOOST_ASIO_OPTION_STORAGE implementation_defined --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # define BOOST_ASIO_OPTION_STORAGE DCB - #else - # define BOOST_ASIO_OPTION_STORAGE termios -@@ -41,7 +41,7 @@ namespace asio { - boost::system::error_code serial_port_base::baud_rate::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - storage.BaudRate = value_; - #else - speed_t baud; -@@ -128,7 +128,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::baud_rate::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - value_ = storage.BaudRate; - #else - speed_t baud = ::cfgetospeed(&storage); -@@ -221,7 +221,7 @@ serial_port_base::flow_control::flow_con - boost::system::error_code serial_port_base::flow_control::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - storage.fOutxCtsFlow = FALSE; - storage.fOutxDsrFlow = FALSE; - storage.fTXContinueOnXoff = TRUE; -@@ -288,7 +288,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::flow_control::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (storage.fOutX && storage.fInX) - { - value_ = software; -@@ -339,7 +339,7 @@ serial_port_base::parity::parity(serial_ - boost::system::error_code serial_port_base::parity::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - switch (value_) - { - case none: -@@ -386,7 +386,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::parity::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (storage.Parity == EVENPARITY) - { - value_ = even; -@@ -434,7 +434,7 @@ serial_port_base::stop_bits::stop_bits( - boost::system::error_code serial_port_base::stop_bits::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - switch (value_) - { - case one: -@@ -470,7 +470,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::stop_bits::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - if (storage.StopBits == ONESTOPBIT) - { - value_ = one; -@@ -507,7 +507,7 @@ serial_port_base::character_size::charac - boost::system::error_code serial_port_base::character_size::store( - BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) const - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - storage.ByteSize = value_; - #else - storage.c_cflag &= ~CSIZE; -@@ -527,7 +527,7 @@ boost::system::error_code serial_port_ba - boost::system::error_code serial_port_base::character_size::load( - const BOOST_ASIO_OPTION_STORAGE& storage, boost::system::error_code& ec) - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - value_ = storage.ByteSize; - #else - if ((storage.c_cflag & CSIZE) == CS5) { value_ = 5; } ---- boost_1_57_0/boost/asio/io_service.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/io_service.hpp 2015-05-04 17:33:18.940003700 -0500 -@@ -24,7 +24,7 @@ - #include - #include - --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - # include - #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \ - || defined(__osf__) -@@ -600,7 +600,7 @@ public: - friend bool has_service(io_service& ios); - - private: --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - detail::winsock_init<> init_; - #elif defined(__sun) || defined(__QNX__) || defined(__hpux) || defined(_AIX) \ - || defined(__osf__) ---- boost_1_57_0/boost/asio/serial_port_base.hpp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/serial_port_base.hpp 2015-05-04 17:33:18.943004100 -0500 -@@ -21,16 +21,16 @@ - #if defined(BOOST_ASIO_HAS_SERIAL_PORT) \ - || defined(GENERATING_DOCUMENTATION) - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - # include --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #include - #include - - #if defined(GENERATING_DOCUMENTATION) - # define BOOST_ASIO_OPTION_STORAGE implementation_defined --#elif defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#elif defined(BOOST_ASIO_WINDOWS) - # define BOOST_ASIO_OPTION_STORAGE DCB - #else - # define BOOST_ASIO_OPTION_STORAGE termios ---- boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp 2014-10-17 17:49:08.000000000 -0500 -+++ boost_1_57_0/boost/asio/ssl/detail/impl/openssl_init.ipp 2015-05-04 17:33:18.946504500 -0500 -@@ -85,15 +85,15 @@ public: - private: - static unsigned long openssl_id_func() - { --#if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_ASIO_WINDOWS) - return ::GetCurrentThreadId(); --#else // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#else // defined(BOOST_ASIO_WINDOWS) - void* id = instance()->thread_id_; - if (id == 0) - instance()->thread_id_ = id = &id; // Ugh. - BOOST_ASIO_ASSERT(sizeof(unsigned long) >= sizeof(void*)); - return reinterpret_cast(id); --#endif // defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_ASIO_WINDOWS) - } - - static void openssl_locking_func(int mode, int n, -@@ -109,10 +109,10 @@ private: - std::vector > mutexes_; - --#if !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#if !defined(BOOST_ASIO_WINDOWS) - // The thread identifiers to be used by openssl. - boost::asio::detail::tss_ptr thread_id_; --#endif // !defined(BOOST_ASIO_WINDOWS) && !defined(__CYGWIN__) -+#endif // !defined(BOOST_ASIO_WINDOWS) - - #if !defined(SSL_OP_NO_COMPRESSION) \ - && (OPENSSL_VERSION_NUMBER >= 0x00908000L) diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch deleted file mode 100644 index 97acc72689d..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-config-cygwin.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- boost_1_57_0/boost/config/platform/cygwin.hpp 2015-05-04 18:02:21.742811600 -0500 -+++ boost_1_57_0/boost/config/platform/cygwin.hpp 2015-05-04 17:16:30.183407900 -0500 -@@ -39,18 +39,8 @@ - #define BOOST_HAS_STDINT_H - #endif - --/// Cygwin has no fenv.h --#define BOOST_NO_FENV_H -- - // boilerplate code: - #include -- --// --// Cygwin lies about XSI conformance, there is no nl_types.h: --// --#ifdef BOOST_HAS_NL_TYPES_H --# undef BOOST_HAS_NL_TYPES_H --#endif - - - ---- boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/libstdcpp3.hpp 2015-05-04 17:54:44.835791700 -0500 -@@ -68,7 +68,7 @@ - #endif - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/config/stdlib/sgi.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/sgi.hpp 2015-05-04 17:54:52.911817300 -0500 -@@ -41,7 +41,7 @@ - #endif - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/config/stdlib/stlport.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/stlport.hpp 2015-05-04 17:55:00.621796300 -0500 -@@ -17,7 +17,7 @@ - #endif - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/config/stdlib/vacpp.hpp 2014-10-26 07:36:42.000000000 -0500 -+++ boost_1_57_0/boost/config/stdlib/vacpp.hpp 2015-05-04 17:55:07.424660200 -0500 -@@ -13,7 +13,7 @@ - #define BOOST_NO_STD_MESSAGES - - // Apple doesn't seem to reliably defined a *unix* macro --#if !defined(CYGWIN) && ( defined(__unix__) \ -+#if ( defined(__unix__) \ - || defined(__unix) \ - || defined(unix) \ - || defined(__APPLE__) \ ---- boost_1_57_0/boost/predef/os/cygwin.h 2014-07-10 08:53:53.000000000 -0500 -+++ boost_1_57_0/boost/predef/os/cygwin.h 2015-05-04 17:57:31.634472500 -0500 -@@ -29,7 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt) - defined(__CYGWIN__) \ - ) - # undef BOOST_OS_CYGWIN --# define BOOST_OS_CGYWIN BOOST_VERSION_NUMBER_AVAILABLE -+# define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER_AVAILABLE - #endif - - #if BOOST_OS_CYGWIN diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch deleted file mode 100644 index 3d9726179be..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-context-cygwin.patch +++ /dev/null @@ -1,600 +0,0 @@ ---- boost_1_57_0/libs/context/build/Jamfile.v2 2014-10-20 01:26:00.000000000 -0500 -+++ boost_1_57_0/libs/context/build/Jamfile.v2 2015-05-04 17:43:10.812161900 -0500 -@@ -29,6 +29,7 @@ local rule default_binary_format ( ) - local tmp = elf ; - if [ os.name ] = "MACOSX" { tmp = mach-o ; } - if [ os.name ] = "NT" { tmp = pe ; } -+ if [ os.name ] = "CYGWIN" { tmp = pe ; } - if [ os.name ] = "AIX" { tmp = xcoff ; } - return $(tmp) ; - } -@@ -581,6 +582,16 @@ alias asm_context_sources - ; - - alias asm_context_sources -+ : asm/make_i386_ms_pe_gas.S -+ asm/jump_i386_ms_pe_gas.S -+ dummy.cpp -+ : 32 -+ x86 -+ pe -+ gcc -+ ; -+ -+alias asm_context_sources - : asm/make_i386_ms_pe_masm.asm - asm/jump_i386_ms_pe_masm.asm - dummy.cpp -@@ -715,6 +726,16 @@ alias asm_context_sources - ; - - alias asm_context_sources -+ : asm/make_x86_64_ms_pe_gas.S -+ asm/jump_x86_64_ms_pe_gas.S -+ dummy.cpp -+ : 64 -+ x86 -+ pe -+ gcc -+ ; -+ -+alias asm_context_sources - : asm/make_x86_64_ms_pe_masm.asm - asm/jump_x86_64_ms_pe_masm.asm - dummy.cpp ---- boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/jump_i386_ms_pe_gas.S 2015-05-04 17:43:10.821663100 -0500 -@@ -0,0 +1,108 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/******************************************************************** -+ * * -+ * -------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | * -+ * -------------------------------------------------------------- * -+ * | 0h | 04h | 08h | 0ch | 010h | 014h | * -+ * -------------------------------------------------------------- * -+ * | EDI | ESI | EBX | EBP | ESP | EIP | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 6 | 7 | 8 | | * -+ * -------------------------------------------------------------- * -+ * | 018h | 01ch | 020h | | * -+ * -------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 9 | | * -+ * -------------------------------------------------------------- * -+ * | 024h | | * -+ * -------------------------------------------------------------- * -+ * |fc_execpt| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 10 | | * -+ * -------------------------------------------------------------- * -+ * | 028h | | * -+ * -------------------------------------------------------------- * -+ * |fc_strage| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 11 | 12 | | * -+ * -------------------------------------------------------------- * -+ * | 02ch | 030h | | * -+ * -------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| | * -+ * -------------------------------------------------------------- * -+ * * -+ * *****************************************************************/ -+ -+.file "jump_i386_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl _jump_fcontext -+.def _jump_fcontext; .scl 2; .type 32; .endef -+_jump_fcontext: -+ movl 0x04(%esp), %ecx /* load address of the first fcontext_t arg */ -+ movl %edi, (%ecx) /* save EDI */ -+ movl %esi, 0x04(%ecx) /* save ESI */ -+ movl %ebx, 0x08(%ecx) /* save EBX */ -+ movl %ebp, 0x0c(%ecx) /* save EBP */ -+ -+ movl %fs:(0x18), %edx /* load NT_TIB */ -+ movl (%edx), %eax /* load current SEH exception list */ -+ movl %eax, 0x24(%ecx) /* save current exception list */ -+ movl 0x04(%edx), %eax /* load current stack base */ -+ movl %eax, 0x18(%ecx) /* save current stack base */ -+ movl 0x08(%edx), %eax /* load current stack limit */ -+ movl %eax, 0x20(%ecx) /* save current stack limit */ -+ movl 0x10(%edx), %eax /* load fiber local storage */ -+ movl %eax, 0x28(%ecx) /* save fiber local storage */ -+ -+ leal 0x04(%esp), %eax /* exclude the return address */ -+ movl %eax, 0x10(%ecx) /* save as stack pointer */ -+ movl (%esp), %eax /* load return address */ -+ movl %eax, 0x14(%ecx) /* save return address */ -+ -+ movl 0x08(%esp), %edx /* load address of the second fcontext_t arg */ -+ movl (%edx), %edi /* restore EDI */ -+ movl 0x04(%edx), %esi /* restore ESI */ -+ movl 0x08(%edx), %ebx /* restore EBX */ -+ movl 0x0c(%edx), %ebp /* restore EBP */ -+ -+ movl 0x10(%esp), %eax /* check if fpu enve preserving was requested */ -+ testl %eax, %eax -+ je 1f -+ -+ stmxcsr 0x2c(%ecx) /* save MMX control word */ -+ fnstcw 0x30(%ecx) /* save x87 control word */ -+ ldmxcsr 0x2c(%edx) /* restore MMX control word */ -+ fldcw 0x30(%edx) /* restore x87 control word */ -+1: -+ movl %edx, %ecx -+ movl %fs:(0x18), %edx /* load NT_TIB */ -+ movl 0x24(%ecx), %eax /* load SEH exception list */ -+ movl %eax, (%edx) /* restore next SEH item */ -+ movl 0x18(%ecx), %eax /* load stack base */ -+ movl %eax, 0x04(%edx) /* restore stack base */ -+ movl 0x20(%ecx), %eax /* load stack limit */ -+ movl %eax, 0x08(%edx) /* restore stack limit */ -+ movl 0x28(%ecx), %eax /* load fiber local storage */ -+ movl %eax, 0x10(%edx) /* restore fiber local storage */ -+ -+ movl 0x0c(%esp), %eax /* use third arg as return value after jump */ -+ -+ movl 0x10(%ecx), %esp /* restore ESP */ -+ movl %eax, 0x04(%esp) /* use third arg as first arg in context function */ -+ movl 0x14(%ecx), %ecx /* fetch the address to return to */ -+ -+ jmp *%ecx /* indirect jump to context */ ---- boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/jump_x86_64_ms_pe_gas.S 2015-05-04 17:43:10.829664200 -0500 -@@ -0,0 +1,189 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/**************************************************************************************** -+ * * -+ * ---------------------------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * -+ * ---------------------------------------------------------------------------------- * -+ * | R12 | R13 | R14 | R15 | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * -+ * ---------------------------------------------------------------------------------- * -+ * | RDI | RSI | RBX | RBP | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 16 | 17 | 18 | 19 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x40 | 0x44 | 0x48 | 0x4c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | RSP | RIP | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 20 | 21 | 22 | 23 | 24 | 25 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x50 | 0x54 | 0x58 | 0x5c | 0x60 | 0x64 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 26 | 27 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x68 | 0x6c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | fbr_strg | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x70 | 0x74 | 0x78 | 0x7c | 0x80 | 0x84 | 0x88 | 0x8c | * -+ * ---------------------------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| fc_xmm | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x90 | 0x94 | 0x98 | 0x9c | 0xa0 | 0xa4 | 0xa8 | 0xac | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xb0 | 0xb4 | 0xb8 | 0xbc | 0xc0 | 0xc4 | 0xc8 | 0xcc | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xd0 | 0xd4 | 0xd8 | 0xdc | 0xe0 | 0xe4 | 0xe8 | 0xec | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xf0 | 0xf4 | 0xf8 | 0xfc | 0x100 | 0x104 | 0x108 | 0x10c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x110 | 0x114 | 0x118 | 0x11c | 0x120 | 0x124 | 0x128 | 0x12c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * * -+ * *************************************************************************************/ -+ -+.file "jump_x86_64_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl jump_fcontext -+.def jump_fcontext; .scl 2; .type 32; .endef -+.seh_proc jump_fcontext -+jump_fcontext: -+.seh_endprologue -+ movq %r12, (%rcx) /* save R12 */ -+ movq %r13, 0x08(%rcx) /* save R13 */ -+ movq %r14, 0x10(%rcx) /* save R14 */ -+ movq %r15, 0x18(%rcx) /* save R15 */ -+ movq %rdi, 0x20(%rcx) /* save RDI */ -+ movq %rsi, 0x28(%rcx) /* save RSI */ -+ movq %rbx, 0x30(%rcx) /* save RBX */ -+ movq %rbp, 0x38(%rcx) /* save RBP */ -+ -+ movq %gs:(0x30), %r10 /* load NT_TIB */ -+ movq 0x08(%r10), %rax /* load current stack base */ -+ movq %rax, 0x50(%rcx) /* save current stack base */ -+ movq 0x10(%r10), %rax /* load current stack limit */ -+ movq %rax, 0x60(%rcx) /* save current stack limit */ -+ movq 0x18(%r10), %rax /* load fiber local storage */ -+ movq %rax, 0x68(%rcx) /* save fiber local storage */ -+ -+ testq %r9, %r9 -+ je 1f -+ -+ stmxcsr 0x70(%rcx) /* save MMX control and status word */ -+ fnstcw 0x74(%rcx) /* save x87 control word */ -+ /* save XMM storage */ -+ /* save start address of SSE register block in R10 */ -+ leaq 0x90(%rcx), %r10 -+ /* shift address in R10 to lower 16 byte boundary */ -+ /* == pointer to SEE register block */ -+ andq $-16, %r10 -+ -+ movaps %xmm6, (%r10) -+ movaps %xmm7, 0x10(%r10) -+ movaps %xmm8, 0x20(%r10) -+ movaps %xmm9, 0x30(%r10) -+ movaps %xmm10, 0x40(%r10) -+ movaps %xmm11, 0x50(%r10) -+ movaps %xmm12, 0x60(%r10) -+ movaps %xmm13, 0x70(%r10) -+ movaps %xmm14, 0x80(%r10) -+ movaps %xmm15, 0x90(%r10) -+ -+ ldmxcsr 0x70(%rdx) /* restore MMX control and status word */ -+ fldcw 0x74(%rdx) /* restore x87 control word */ -+ /* restore XMM storage */ -+ /* save start address of SSE register block in R10 */ -+ leaq 0x90(%rdx), %r10 -+ /* shift address in R10 to lower 16 byte boundary */ -+ /* == pointer to SEE register block */ -+ andq $-16, %r10 -+ -+ movaps (%r10), %xmm6 -+ movaps 0x10(%r10), %xmm7 -+ movaps 0x20(%r10), %xmm8 -+ movaps 0x30(%r10), %xmm9 -+ movaps 0x40(%r10), %xmm10 -+ movaps 0x50(%r10), %xmm11 -+ movaps 0x60(%r10), %xmm12 -+ movaps 0x70(%r10), %xmm13 -+ movaps 0x80(%r10), %xmm14 -+ movaps 0x90(%r10), %xmm15 -+ -+1: -+ leaq 0x08(%rsp), %rax /* exclude the return address */ -+ movq %rax, 0x40(%rcx) /* save as stack pointer */ -+ movq (%rsp), %rax /* load return address */ -+ movq %rax, 0x48(%rcx) /* save return address */ -+ -+ movq (%rdx), %r12 /* restore R12 */ -+ movq 0x08(%rdx), %r13 /* restore R13 */ -+ movq 0x10(%rdx), %r14 /* restore R14 */ -+ movq 0x18(%rdx), %r15 /* restore R15 */ -+ movq 0x20(%rdx), %rdi /* restore RDI */ -+ movq 0x28(%rdx), %rsi /* restore RSI */ -+ movq 0x30(%rdx), %rbx /* restore RBX */ -+ movq 0x38(%rdx), %rbp /* restore RBP */ -+ -+ movq %gs:(0x30), %r10 /* load NT_TIB */ -+ movq 0x50(%rdx), %rax /* load stack base */ -+ movq %rax, 0x08(%r10) /* restore stack base */ -+ movq 0x60(%rdx), %rax /* load stack limit */ -+ movq %rax, 0x10(%r10) /* restore stack limit */ -+ movq 0x68(%rdx), %rax /* load fiber local storage */ -+ movq %rax, 0x18(%r10) /* restore fiber local storage */ -+ -+ movq 0x40(%rdx), %rsp /* restore RSP */ -+ movq 0x48(%rdx), %r10 /* fetch the address to returned to */ -+ -+ movq %r8, %rax /* use third arg as return value after jump */ -+ movq %r8, %rcx /* use third arg as first arg in context function */ -+ -+ jmp *%r10 /* indirect jump to caller */ -+.seh_endproc ---- boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/make_i386_ms_pe_gas.S 2015-05-04 17:43:10.836165000 -0500 -@@ -0,0 +1,115 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/******************************************************************** -+ * * -+ * -------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | * -+ * -------------------------------------------------------------- * -+ * | 0h | 04h | 08h | 0ch | 010h | 014h | * -+ * -------------------------------------------------------------- * -+ * | EDI | ESI | EBX | EBP | ESP | EIP | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 6 | 7 | 8 | | * -+ * -------------------------------------------------------------- * -+ * | 018h | 01ch | 020h | | * -+ * -------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 9 | | * -+ * -------------------------------------------------------------- * -+ * | 024h | | * -+ * -------------------------------------------------------------- * -+ * |fc_execpt| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 10 | | * -+ * -------------------------------------------------------------- * -+ * | 028h | | * -+ * -------------------------------------------------------------- * -+ * |fc_strage| | * -+ * -------------------------------------------------------------- * -+ * -------------------------------------------------------------- * -+ * | 11 | 12 | | * -+ * -------------------------------------------------------------- * -+ * | 02ch | 030h | | * -+ * -------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| | * -+ * -------------------------------------------------------------- * -+ * * -+ * *****************************************************************/ -+ -+.file "make_i386_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl _make_fcontext -+.def _make_fcontext; .scl 2; .type 32; .endef -+_make_fcontext: -+ movl 0x04(%esp), %eax /* load 1. arg of make_fcontext, pointer to context stack (base) */ -+ leal -0x34(%eax),%eax /* reserve space for fcontext_t at top of context stack */ -+ -+ /* shift address in EAX to lower 16 byte boundary */ -+ /* == pointer to fcontext_t and address of context stack */ -+ andl $-16, %eax -+ -+ movl 0x04(%esp), %ecx /* load 1. arg of make_fcontext, pointer to context stack (base) */ -+ movl %ecx, 0x18(%eax) /* save address of context stack (base) in fcontext_t */ -+ movl 0x08(%esp), %edx /* load 2. arg of make_fcontext, context stack size */ -+ movl %edx, 0x1c(%eax) /* save context stack size in fcontext_t */ -+ negl %edx /* negate stack size for LEA instruction (== substraction) */ -+ leal (%ecx,%edx),%ecx /* compute bottom address of context stack (limit) */ -+ movl %ecx, 0x20(%eax) /* save address of context stack (limit) in fcontext_t */ -+ movl 0x0c(%esp), %ecx /* load 3. arg of make_fcontext, pointer to context function */ -+ movl %ecx, 0x14(%eax) /* save address of context function in fcontext_t */ -+ -+ stmxcsr 0x02c(%eax) /* save MMX control word */ -+ fnstcw 0x030(%eax) /* save x87 control word */ -+ -+ leal -0x1c(%eax),%edx /* reserve space for last frame and seh on context stack, (ESP - 0x4) % 16 == 0 */ -+ movl %edx, 0x10(%eax) /* save address in EDX as stack pointer for context function */ -+ -+ movl $finish, %ecx /* abs address of finish */ -+ movl %ecx, (%edx) /* save address of finish as return address for context function */ -+ /* entered after context function returns */ -+ -+ /* traverse current seh chain to get the last exception handler installed by Windows */ -+ /* note that on Windows Server 2008 and 2008 R2, SEHOP is activated by default */ -+ /* the exception handler chain is tested for the presence of ntdll.dll!FinalExceptionHandler */ -+ /* at its end by RaiseException all seh andlers are disregarded if not present and the */ -+ /* program is aborted */ -+ movl %fs:(0x18), %ecx /* load NT_TIB into ECX */ -+ -+walk: -+ movl (%ecx), %edx /* load 'next' member of current SEH into EDX */ -+ incl %edx /* test if 'next' of current SEH is last (== 0xffffffff) */ -+ jz found -+ decl %edx -+ xchgl %ecx, %edx /* exchange content; ECX contains address of next SEH */ -+ jmp walk /* inspect next SEH */ -+ -+found: -+ movl 0x04(%ecx), %ecx /* load 'handler' member of SEH == address of last SEH handler installed by Windows */ -+ movl 0x10(%eax), %edx /* load address of stack pointer for context function */ -+ movl %ecx, 0x18(%edx) /* save address in ECX as SEH handler for context */ -+ movl $0xffffffff,%ecx /* set ECX to -1 */ -+ movl %ecx, 0x14(%edx) /* save ECX as next SEH item */ -+ leal 0x14(%edx), %ecx /* load address of next SEH item */ -+ movl %ecx, 0x24(%eax) /* save next SEH */ -+ -+ ret -+ -+finish: -+ /* ESP points to same address as ESP on entry of context function + 0x4 */ -+ xorl %eax, %eax -+ movl %eax, (%esp) /* exit code is zero */ -+ call __exit /* exit application */ -+ hlt -+ -+.def __exit; .scl 2; .type 32; .endef /* standard C library function */ ---- boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S 1969-12-31 18:00:00.000000000 -0600 -+++ boost_1_57_0/libs/context/src/asm/make_x86_64_ms_pe_gas.S 2015-05-04 17:43:10.843165900 -0500 -@@ -0,0 +1,132 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/**************************************************************************************** -+ * * -+ * ---------------------------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * -+ * ---------------------------------------------------------------------------------- * -+ * | R12 | R13 | R14 | R15 | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * -+ * ---------------------------------------------------------------------------------- * -+ * | RDI | RSI | RBX | RBP | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 16 | 17 | 18 | 19 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x40 | 0x44 | 0x48 | 0x4c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | RSP | RIP | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 20 | 21 | 22 | 23 | 24 | 25 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x50 | 0x54 | 0x58 | 0x5c | 0x60 | 0x64 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | sp | size | limit | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 26 | 27 | | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x68 | 0x6c | | * -+ * ---------------------------------------------------------------------------------- * -+ * | fbr_strg | | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x70 | 0x74 | 0x78 | 0x7c | 0x80 | 0x84 | 0x88 | 0x8c | * -+ * ---------------------------------------------------------------------------------- * -+ * | fc_mxcsr|fc_x87_cw| fc_xmm | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x90 | 0x94 | 0x98 | 0x9c | 0xa0 | 0xa4 | 0xa8 | 0xac | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 44 | 45 | 46 | 47 | 48 | 49 | 50 | 51 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xb0 | 0xb4 | 0xb8 | 0xbc | 0xc0 | 0xc4 | 0xc8 | 0xcc | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xd0 | 0xd4 | 0xd8 | 0xdc | 0xe0 | 0xe4 | 0xe8 | 0xec | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0xf0 | 0xf4 | 0xf8 | 0xfc | 0x100 | 0x104 | 0x108 | 0x10c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * ---------------------------------------------------------------------------------- * -+ * | 68 | 69 | 70 | 71 | 72 | 73 | 74 | 75 | * -+ * ---------------------------------------------------------------------------------- * -+ * | 0x110 | 0x114 | 0x118 | 0x11c | 0x120 | 0x124 | 0x128 | 0x12c | * -+ * ---------------------------------------------------------------------------------- * -+ * | SEE registers (XMM6-XMM15) | * -+ * ---------------------------------------------------------------------------------- * -+ * * -+ * *************************************************************************************/ -+ -+.file "make_x86_64_ms_pe_gas.S" -+.text -+.p2align 4,,15 -+.globl make_fcontext -+.def make_fcontext; .scl 2; .type 32; .endef -+.seh_proc make_fcontext -+make_fcontext: -+.seh_endprologue -+ leaq -0x130(%rcx),%rax /* reserve space for fcontext_t at top of context stack */ -+ -+ /* shift address in RAX to lower 16 byte boundary */ -+ /* == pointer to fcontext_t and address of context stack */ -+ andq $-16, %rax -+ -+ movq %r8, 0x48(%rax) /* save address of context function in fcontext_t */ -+ movq %rdx, 0x58(%rax) /* save context stack size in fcontext_t */ -+ movq %rcx, 0x50(%rax) /* save address of context stack pointer (base) in fcontext_t */ -+ -+ negq %rdx /* negate stack size for LEA instruction (== substraction) */ -+ leaq (%rcx,%rdx),%rcx /* compute bottom address of context stack (limit) */ -+ movq %rcx, 0x60(%rax) /* save bottom address of context stack (limit) in fcontext_t */ -+ -+ stmxcsr 0x70(%rax) /* save MMX control and status word */ -+ fnstcw 0x74(%rax) /* save x87 control word */ -+ -+ leaq -0x28(%rax),%rdx /* reserve 32byte shadow space + return address on stack, (RSP - 0x8) % 16 == 0 */ -+ movq %rdx, 0x40(%rax) /* save address in RDX as stack pointer for context function */ -+ -+ leaq finish(%rip),%rcx /* compute abs address of label finish */ -+ movq %rcx,(%rdx) /* save address of finish as return address for context function */ -+ /* entered after context function returns */ -+ -+ ret -+ -+finish: -+ /* RSP points to same address as RSP on entry of context function + 0x8 */ -+ xorq %rcx, %rcx /* exit code is zero */ -+ call _exit /* exit application */ -+ hlt -+.seh_endproc -+ -+.def _exit; .scl 2; .type 32; .endef /* standard C library function */ diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch deleted file mode 100644 index cbb5757746d..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- boost_1_57_0/libs/filesystem/src/operations.cpp 2014-10-29 10:34:00.000000000 -0500 -+++ boost_1_57_0/libs/filesystem/src/operations.cpp 2015-05-04 23:30:34.278446000 -0500 -@@ -1966,8 +1966,7 @@ namespace - { - errno = 0; - --# if !defined(__CYGWIN__)\ -- && defined(_POSIX_THREAD_SAFE_FUNCTIONS)\ -+# if defined(_POSIX_THREAD_SAFE_FUNCTIONS)\ - && defined(_SC_THREAD_SAFE_FUNCTIONS)\ - && (_POSIX_THREAD_SAFE_FUNCTIONS+0 >= 0)\ - && (!defined(__hpux) || defined(_REENTRANT)) \ ---- boost_1_57_0/libs/filesystem/src/path.cpp 2014-10-29 10:34:00.000000000 -0500 -+++ boost_1_57_0/libs/filesystem/src/path.cpp 2015-05-04 17:45:45.582315200 -0500 -@@ -36,7 +36,7 @@ - # include "windows_file_codecvt.hpp" - # include - #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \ -- || defined(__FreeBSD__) || defined(__OPEN_BSD__) -+ || defined(__FreeBSD__) || defined(__OPEN_BSD__) || defined(__CYGWIN__) - # include - #endif - -@@ -831,7 +831,7 @@ namespace - std::locale global_loc = std::locale(); - return std::locale(global_loc, new windows_file_codecvt); - # elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \ -- || defined(__FreeBSD__) || defined(__OpenBSD__) -+ || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) - // "All BSD system functions expect their string parameters to be in UTF-8 encoding - // and nothing else." See - // http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPInternational/Articles/FileEncodings.html diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch deleted file mode 100644 index 16208385a9b..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- boost_1_57_0/libs/locale/build/Jamfile.v2 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/build/Jamfile.v2 2015-05-04 18:11:52.956846500 -0500 -@@ -261,7 +261,7 @@ rule configure-full ( properties * : fla - - } - -- if ! $(found-iconv) && ! $(found-icu) && ! windows in $(properties) && ! cygwin in $(properties) -+ if ! $(found-iconv) && ! $(found-icu) && ! windows in $(properties) - { - ECHO "- Boost.Locale needs either iconv or ICU library to be built." ; - result += no ; -@@ -298,7 +298,6 @@ rule configure-full ( properties * : fla - if ! in $(properties:G) - { - if windows in $(properties) -- || cygwin in $(properties) - { - properties += on ; - } -@@ -335,7 +334,7 @@ rule configure-full ( properties * : fla - } - - if ( ! off in $(properties) || ! off in $(properties) ) -- && ( windows in $(properties) || cygwin in $(properties) ) -+ && windows in $(properties) - { - result += win32/lcid.cpp ; - } ---- boost_1_57_0/libs/locale/src/encoding/codepage.cpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/src/encoding/codepage.cpp 2015-05-04 23:16:01.778652600 -0500 -@@ -8,7 +8,7 @@ - #define BOOST_LOCALE_SOURCE - #include - --#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_WINDOWS) - #define BOOST_LOCALE_WITH_WCONV - #endif - ---- boost_1_57_0/libs/locale/src/encoding/conv.hpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/src/encoding/conv.hpp 2015-05-04 23:16:08.454000300 -0500 -@@ -59,7 +59,7 @@ namespace boost { - return normalize_encoding(l).compare(normalize_encoding(r)); - } - -- #if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+ #if defined(BOOST_WINDOWS) - int encoding_to_windows_codepage(char const *ccharset); - #endif - ---- boost_1_57_0/libs/locale/src/util/default_locale.cpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/src/util/default_locale.cpp 2015-05-04 23:16:16.311998100 -0500 -@@ -15,7 +15,7 @@ - # pragma warning(disable : 4996) - #endif - --#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_WINDOWS) - #ifndef NOMINMAX - #define NOMINMAX - #endif ---- boost_1_57_0/libs/locale/test/test_codepage.cpp 2014-04-06 08:11:49.000000000 -0500 -+++ boost_1_57_0/libs/locale/test/test_codepage.cpp 2015-05-04 23:16:40.883618300 -0500 -@@ -23,7 +23,7 @@ - # include - #endif - --#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__)) -+#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS) - #ifndef NOMINMAX - # define NOMINMAX - #endif -@@ -395,7 +395,7 @@ int main() - def.push_back("posix"); - #endif - -- #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__)) -+ #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS) - test_iso_8859_8 = IsValidCodePage(28598)!=0; - #endif - diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch deleted file mode 100644 index a7748ec58d8..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-log-cygwin.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- boost_1_57_0/boost/log/detail/config.hpp 2014-10-29 19:19:00.000000000 -0500 -+++ boost_1_57_0/boost/log/detail/config.hpp 2015-05-04 17:56:38.663746100 -0500 -@@ -96,11 +96,6 @@ - # define BOOST_LOG_BROKEN_CONSTANT_EXPRESSIONS - #endif - --#if defined(__CYGWIN__) -- // Boost.ASIO is broken on Cygwin --# define BOOST_LOG_NO_ASIO --#endif -- - #if !defined(BOOST_LOG_USE_NATIVE_SYSLOG) && defined(BOOST_LOG_NO_ASIO) - # ifndef BOOST_LOG_WITHOUT_SYSLOG - # define BOOST_LOG_WITHOUT_SYSLOG ---- boost_1_57_0/libs/log/build/Jamfile.v2 2014-10-29 19:19:00.000000000 -0500 -+++ boost_1_57_0/libs/log/build/Jamfile.v2 2015-05-04 22:16:49.242537800 -0500 -@@ -170,10 +170,6 @@ project boost/log - windows:ws2_32 - windows:mswsock - -- cygwin:__USE_W32_SOCKETS -- cygwin:ws2_32 -- cygwin:mswsock -- - linux:rt - linux:_XOPEN_SOURCE=600 - linux:_GNU_SOURCE=1 ---- boost_1_57_0/libs/log/src/windows_version.hpp 2014-10-29 19:19:00.000000000 -0500 -+++ boost_1_57_0/libs/log/src/windows_version.hpp 2015-05-04 23:17:08.281597400 -0500 -@@ -18,7 +18,7 @@ - - #include - --#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#if defined(BOOST_WINDOWS) - - #if defined(BOOST_LOG_USE_WINNT6_API) - -@@ -50,6 +50,6 @@ - #define WIN32_LEAN_AND_MEAN - #endif - --#endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__) -+#endif // defined(BOOST_WINDOWS) - - #endif // BOOST_LOG_WINDOWS_VERSION_HPP_INCLUDED_ diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch deleted file mode 100644 index 35e6905b0f3..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/atomic_count.hpp 2015-05-04 17:47:15.556740500 -0500 -@@ -79,7 +79,7 @@ - #elif defined( BOOST_SP_HAS_SYNC ) - # include - --#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -+#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) - # include - - #elif defined(__GLIBCPP__) || defined(__GLIBCXX__) ---- boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/lightweight_mutex.hpp 2015-05-04 17:47:45.234509100 -0500 -@@ -32,7 +32,7 @@ - # include - #elif defined(BOOST_HAS_PTHREADS) - # include --#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -+#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) - # include - #else - // Use #define BOOST_DISABLE_THREADS to avoid the error ---- boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/sp_counted_base.hpp 2015-05-04 17:47:45.240009800 -0500 -@@ -65,7 +65,7 @@ - #elif defined(__GNUC__) && ( defined( __sparcv9 ) || ( defined( __sparcv8 ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 ) ) ) - # include - --#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined(__CYGWIN__) -+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - # include - - #elif defined( _AIX ) ---- boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/sp_interlocked.hpp 2015-05-04 17:48:39.316376700 -0500 -@@ -119,7 +119,7 @@ extern "C" long __cdecl _InterlockedExch - # define BOOST_SP_INTERLOCKED_EXCHANGE _InterlockedExchange - # define BOOST_SP_INTERLOCKED_EXCHANGE_ADD _InterlockedExchangeAdd - --#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) -+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - - namespace boost - { ---- boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/spinlock.hpp 2015-05-04 17:47:45.247510800 -0500 -@@ -49,7 +49,7 @@ - #elif defined( BOOST_SP_HAS_SYNC ) - # include - --#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) -+#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) - # include - - #elif defined(BOOST_HAS_PTHREADS) ---- boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/boost/smart_ptr/detail/yield_k.hpp 2015-05-04 17:47:45.253511600 -0500 -@@ -47,7 +47,7 @@ extern "C" void _mm_pause(); - - // - --#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) -+#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - - #if defined( BOOST_USE_WINDOWS_H ) - # include ---- boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp 2014-08-21 15:48:32.000000000 -0500 -+++ boost_1_57_0/libs/smart_ptr/test/sp_interlocked_test.cpp 2015-05-04 23:18:21.717422600 -0500 -@@ -8,7 +8,7 @@ - // http://www.boost.org/LICENSE_1_0.txt - // - --#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) -+#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) - - #include - #include diff --git a/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch b/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch deleted file mode 100644 index e241f37f203..00000000000 --- a/pkgs/development/libraries/boost/cygwin-1.57.0-system-cygwin.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- boost_1_57_0/boost/system/api_config.hpp 2014-08-03 15:44:11.000000000 -0500 -+++ boost_1_57_0/boost/system/api_config.hpp 2015-05-04 17:51:31.189701800 -0500 -@@ -33,7 +33,7 @@ - // Standalone MinGW and all other known Windows compilers do predefine _WIN32 - // Compilers that predefine _WIN32 or __MINGW32__ do so for Windows 64-bit builds too. - --# if defined(_WIN32) || defined(__CYGWIN__) // Windows default, including MinGW and Cygwin -+# if defined(_WIN32) // Windows default, including MinGW and Cygwin - # define BOOST_WINDOWS_API - # else - # define BOOST_POSIX_API ---- boost_1_57_0/boost/system/detail/error_code.ipp 2014-08-03 15:44:11.000000000 -0500 -+++ boost_1_57_0/boost/system/detail/error_code.ipp 2015-05-04 17:51:02.925112700 -0500 -@@ -97,7 +97,7 @@ namespace - char buf[64]; - char * bp = buf; - std::size_t sz = sizeof(buf); -- # if defined(__CYGWIN__) || defined(__USE_GNU) -+ # if defined(__GNU_VISIBLE) || defined(__USE_GNU) - // Oddball version of strerror_r - const char * c_str = strerror_r( ev, bp, sz ); - return c_str diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch deleted file mode 100644 index b60a3ac49d3..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp -index 8b2bc43..d04f2fe 100644 ---- a/libs/units/example/autoprefixes.cpp -+++ b/libs/units/example/autoprefixes.cpp -@@ -67,7 +67,7 @@ struct thing_base_unit : boost::units::base_unit - { - static const char* name() { return("EUR"); } -- static const char* symbol() { return("€"); } -+ static const char* symbol() { return("€"); } - }; - - int main() -@@ -140,7 +140,7 @@ int main() - - quantity ce = 2048. * euro_base_unit::unit_type(); - cout << name_format << engineering_prefix << ce << endl; // 2.048 kiloEUR -- cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€ -+ cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€ - - - return 0; diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch deleted file mode 100644 index 15ce4007675..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.50.0-pool.patch +++ /dev/null @@ -1,122 +0,0 @@ -Index: boost/pool/pool.hpp -=================================================================== ---- a/boost/pool/pool.hpp (revision 78317) -+++ b/boost/pool/pool.hpp (revision 78326) -@@ -27,4 +27,6 @@ - #include - -+// std::numeric_limits -+#include - // boost::math::static_lcm - #include -@@ -358,4 +360,13 @@ - } - -+ size_type max_chunks() const -+ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. -+ size_type partition_size = alloc_size(); -+ size_type POD_size = math::static_lcm::value + sizeof(size_type); -+ size_type max_chunks = (std::numeric_limits::max() - POD_size) / alloc_size(); -+ -+ return max_chunks; -+ } -+ - static void * & nextof(void * const ptr) - { //! \returns Pointer dereferenced. -@@ -377,5 +388,7 @@ - //! the first time that object needs to allocate system memory. - //! The default is 32. This parameter may not be 0. -- //! \param nmax_size is the maximum number of chunks to allocate in one block. -+ //! \param nmax_size is the maximum number of chunks to allocate in one block. -+ set_next_size(nnext_size); -+ set_max_size(nmax_size); - } - -@@ -400,7 +413,7 @@ - } - void set_next_size(const size_type nnext_size) -- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. -- //! \returns nnext_size. -- next_size = start_size = nnext_size; -+ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. -+ BOOST_USING_STD_MIN(); -+ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); - } - size_type get_max_size() const -@@ -410,5 +423,6 @@ - void set_max_size(const size_type nmax_size) - { //! Set max_size. -- max_size = nmax_size; -+ BOOST_USING_STD_MIN(); -+ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); - } - size_type get_requested_size() const -@@ -713,7 +727,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // initialize it, -@@ -753,7 +767,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // initialize it, -@@ -797,4 +811,6 @@ - //! \returns Address of chunk n if allocated ok. - //! \returns 0 if not enough memory for n chunks. -+ if (n > max_chunks()) -+ return 0; - - const size_type partition_size = alloc_size(); -@@ -845,7 +861,7 @@ - BOOST_USING_STD_MIN(); - if(!max_size) -- next_size <<= 1; -+ set_next_size(next_size << 1); - else if( next_size*partition_size/requested_size < max_size) -- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); -+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); - - // insert it into the list, -Index: libs/pool/test/test_bug_6701.cpp -=================================================================== ---- a/libs/pool/test/test_bug_6701.cpp (revision 78326) -+++ b/libs/pool/test/test_bug_6701.cpp (revision 78326) -@@ -0,0 +1,27 @@ -+/* Copyright (C) 2012 Étienne Dupuis -+* -+* Use, modification and distribution is subject to the -+* Boost Software License, Version 1.0. (See accompanying -+* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701) -+ -+#include -+#include -+ -+int main() -+{ -+ boost::pool<> p(1024, std::numeric_limits::max() / 768); -+ -+ void *x = p.malloc(); -+ BOOST_ASSERT(!x); -+ -+ BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_next_size()); -+ BOOST_ASSERT(std::numeric_limits::max() / 1024 >= p.get_max_size()); -+ -+ void *y = p.ordered_malloc(std::numeric_limits::max() / 768); -+ BOOST_ASSERT(!y); -+ -+ return 0; -+} diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch deleted file mode 100644 index b7c91284d9b..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urp boost_1_54_0-orig/boost/locale/boundary/segment.hpp boost_1_54_0/boost/locale/boundary/segment.hpp ---- boost_1_54_0-orig/boost/locale/boundary/segment.hpp 2013-07-23 00:47:27.020787174 +0200 -+++ boost_1_54_0/boost/locale/boundary/segment.hpp 2013-07-23 00:50:40.382959016 +0200 -@@ -27,7 +27,6 @@ namespace boundary { - int compare_text(LeftIterator l_begin,LeftIterator l_end,RightIterator r_begin,RightIterator r_end) - { - typedef LeftIterator left_iterator; -- typedef RightIterator right_iterator; - typedef typename std::iterator_traits::value_type char_type; - typedef std::char_traits traits; - while(l_begin!=l_end && r_begin!=r_end) { diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch deleted file mode 100644 index 6c1d0a021ed..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up ./boost/pool/pool.hpp~ ./boost/pool/pool.hpp ---- a/boost/pool/pool.hpp~ 2013-08-21 17:49:56.023296922 +0200 -+++ b/boost/pool/pool.hpp 2013-08-22 11:38:01.133912638 +0200 -@@ -361,9 +361,7 @@ class pool: protected simple_segregated_ - { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. - size_type partition_size = alloc_size(); - size_type POD_size = math::static_lcm::value + sizeof(size_type); -- size_type max_chunks = (std::numeric_limits::max() - POD_size) / alloc_size(); -- -- return max_chunks; -+ return (std::numeric_limits::max() - POD_size) / alloc_size(); - } - - static void * & nextof(void * const ptr) diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch deleted file mode 100644 index 8adf8ed2080..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.54.0-python-unused_typedef.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up boost_1_53_0/boost/python/to_python_value.hpp\~ boost_1_53_0/boost/python/to_python_value.hpp ---- boost_1_53_0/boost/python/to_python_value.hpp~ 2007-12-16 11:12:07.000000000 +0100 -+++ boost_1_53_0/boost/python/to_python_value.hpp 2013-07-23 16:19:02.518904596 +0200 -@@ -147,8 +147,8 @@ namespace detail - template - inline PyObject* registry_to_python_value::operator()(argument_type x) const - { -- typedef converter::registered r; - # if BOOST_WORKAROUND(__GNUC__, < 3) -+ typedef converter::registered r; - // suppresses an ICE, somehow - (void)r::converters; - # endif - -Diff finished. Tue Jul 23 16:19:05 2013 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch deleted file mode 100644 index cf9756e40ea..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-move-is_class.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up ./move/core.hpp~ ./move/core.hpp ---- a/boost/move/core.hpp~ 2015-02-09 17:33:35.000000000 +0100 -+++ b/boost/move/core.hpp 2015-02-13 13:54:52.012130813 +0100 -@@ -43,6 +43,7 @@ - #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) - - #include -+ #include - - //Move emulation rv breaks standard aliasing rules so add workarounds for some compilers - #if defined(__GNUC__) && (__GNUC__ >= 4) && \ -@@ -65,7 +66,7 @@ - template - class rv - : public ::boost::move_detail::if_c -- < ::boost::move_detail::is_class_or_union::value -+ < ::boost::is_class::value - , T - , ::boost::move_detail::nat - >::type diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch deleted file mode 100644 index 561cef19eb2..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-mpl-print.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp ---- boost_1_57_0/boost/mpl/print.hpp~ 2014-07-09 23:12:31.000000000 +0200 -+++ boost_1_57_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100 -@@ -52,16 +52,15 @@ struct print - enum { n = sizeof(T) + -1 }; - #elif defined(__MWERKS__) - void f(int); --#else -- enum { -- n = --# if defined(__EDG_VERSION__) -- aux::dependent_unsigned::value > -1 --# else -- sizeof(T) > -1 --# endif -- }; --#endif -+#elif defined(__EDG_VERSION__) -+ enum { n = aux::dependent_unsigned::value > -1 }; -+#elif defined(BOOST_GCC) -+ enum { n1 }; -+ enum { n2 }; -+ enum { n = n1 != n2 }; -+#else -+ enum { n = sizeof(T) > -1 }; -+#endif - }; - - #if defined(BOOST_MSVC) - -Diff finished. Tue Jan 20 12:45:03 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch deleted file mode 100644 index 57e6206bba1..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-pool-test_linking.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up boost_1_57_0/libs/pool/test/Jamfile.v2\~ boost_1_57_0/libs/pool/test/Jamfile.v2 ---- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2014-07-10 06:36:10.000000000 +0200 -+++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-01-20 13:59:10.818700586 +0100 -@@ -28,17 +28,17 @@ explicit valgrind_config_check ; - local use-valgrind = [ check-target-builds valgrind_config_check "valgrind" : "valgrind --error-exitcode=1" : no ] ; - - test-suite pool : -- [ run test_simple_seg_storage.cpp ] -- [ run test_pool_alloc.cpp ] -- [ run pool_msvc_compiler_bug_test.cpp ] -- [ run test_msvc_mem_leak_detect.cpp ] -- [ run test_bug_3349.cpp ] -- [ run test_bug_4960.cpp ] -- [ run test_bug_1252.cpp ] -- [ run test_bug_2696.cpp ] -- [ run test_bug_5526.cpp ] -+ [ run test_simple_seg_storage.cpp : : : /boost/system//boost_system ] -+ [ run test_pool_alloc.cpp : : : /boost/system//boost_system ] -+ [ run pool_msvc_compiler_bug_test.cpp : : : /boost/system//boost_system ] -+ [ run test_msvc_mem_leak_detect.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_3349.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_4960.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_1252.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_2696.cpp : : : /boost/system//boost_system ] -+ [ run test_bug_5526.cpp : : : /boost/system//boost_system ] - [ run test_threading.cpp : : : multi /boost/thread//boost_thread gcc:-Wno-attributes gcc:-Wno-missing-field-initializers ] -- [ run ../example/time_pool_alloc.cpp ] -+ [ run ../example/time_pool_alloc.cpp : : : /boost/system//boost_system ] - [ compile test_poisoned_macros.cpp ] - - # - -Diff finished. Tue Jan 20 13:59:16 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch deleted file mode 100644 index eb9ea14011f..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/boost/signals2/trackable.hpp -+++ b/boost/signals2/trackable.hpp -@@ -18,6 +18,7 @@ - - #include - #include -+#include - - namespace boost { - namespace signals2 { diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch deleted file mode 100644 index 282962987c5..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp ---- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~ 2014-10-13 12:21:40.000000000 +0200 -+++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-01-20 13:25:50.069710766 +0100 -@@ -282,12 +282,12 @@ struct grammar_definition - #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) - typedef impl::grammar_helper_base helper_base_t; - typedef grammar_helper_list helper_list_t; -- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; - - helper_list_t& helpers = - grammartract_helper_list::do_(self); - - # if defined(BOOST_INTEL_CXX_VERSION) -+ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; - for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) - (*i)->undefine(self); - # else - -Diff finished. Tue Jan 20 13:25:53 2015 diff --git a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch b/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch deleted file mode 100644 index 30ebb981b70..00000000000 --- a/pkgs/development/libraries/boost/cygwin-fedora-boost-1.57.0-uuid-comparison.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/boost/uuid/detail/uuid_x86.hpp -+++ b/boost/uuid/detail/uuid_x86.hpp -@@ -100,7 +100,7 @@ inline bool operator< (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT - cmp = (cmp - 1u) ^ cmp; - rcmp = (rcmp - 1u) ^ rcmp; - -- return static_cast< uint16_t >(cmp) < static_cast< uint16_t >(rcmp); -+ return cmp < rcmp; - } - - } // namespace uuids From b71493598a47dbe7597ba33832042a4cd958fade Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Apr 2019 22:20:04 -0400 Subject: [PATCH 2/3] herqq: remove gcc6.patch not referenced in nix code --- pkgs/development/libraries/herqq/gcc6.patch | 1320 ------------------- 1 file changed, 1320 deletions(-) delete mode 100644 pkgs/development/libraries/herqq/gcc6.patch diff --git a/pkgs/development/libraries/herqq/gcc6.patch b/pkgs/development/libraries/herqq/gcc6.patch deleted file mode 100644 index b0f7d8d0c6f..00000000000 --- a/pkgs/development/libraries/herqq/gcc6.patch +++ /dev/null @@ -1,1320 +0,0 @@ -diff --git c/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp i/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp -index c4d2ebe..707dbdb 100644 ---- c/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp -+++ i/herqq/apps/simple_avtest-app/mediamanager_dialog.cpp -@@ -306,7 +306,7 @@ void MediaManagerDialog::avTransportStateChanged( - { - foreach(const HAvtLastChangeInfo& info, infos) - { -- if (info.propertyName().compare("TransportState", Qt::CaseInsensitive) == 0) -+ if (info.propertyName().compare(QString("TransportState"), Qt::CaseInsensitive) == 0) - { - HTransportState state(info.value().toString()); - if (state.isValid()) -diff --git c/herqq/hupnp/src/dataelements/hproduct_tokens.cpp i/herqq/hupnp/src/dataelements/hproduct_tokens.cpp -index 40f9fda..6739a58 100644 ---- c/herqq/hupnp/src/dataelements/hproduct_tokens.cpp -+++ i/herqq/hupnp/src/dataelements/hproduct_tokens.cpp -@@ -99,7 +99,7 @@ bool HProductToken::isValidUpnpToken() const - { - QString vrs = version(); - -- return (m_token.compare("upnp", Qt::CaseInsensitive) == 0) && -+ return (m_token.compare(QString("upnp"), Qt::CaseInsensitive) == 0) && - (vrs.size() == 3 && - (vrs[0] == '1') && - vrs[1] == '.' && -@@ -110,7 +110,7 @@ bool HProductToken::isValidDlnaDocToken() const - { - QString vrs = version(); - -- bool b = m_token.compare("DLNADOC", Qt::CaseInsensitive) == 0 && -+ bool b = m_token.compare(QString("DLNADOC"), Qt::CaseInsensitive) == 0 && - vrs.size() >= 3 && - vrs[0] == '1' && - vrs[1] == '.'; -diff --git c/herqq/hupnp/src/dataelements/hresourcetype.cpp i/herqq/hupnp/src/dataelements/hresourcetype.cpp -index 8ed2492..94ab1e0 100644 ---- c/herqq/hupnp/src/dataelements/hresourcetype.cpp -+++ i/herqq/hupnp/src/dataelements/hresourcetype.cpp -@@ -56,7 +56,7 @@ HResourceType::HResourceType(const QString& resourceTypeAsStr) : - { - return; - } -- if (tmp[1].compare("schemas-upnp-org") != 0) -+ if (tmp[1].compare(QString("schemas-upnp-org")) != 0) - { - flags = 0x01; - tmp[1] = tmp[1].replace('.', '-'); -@@ -67,11 +67,11 @@ HResourceType::HResourceType(const QString& resourceTypeAsStr) : - } - - tmp[2] = tmp[2].simplified(); -- if (tmp[2].compare("device") == 0) -+ if (tmp[2].compare(QString("device")) == 0) - { - flags |= 0x04; - } -- else if (tmp[2].compare("service") == 0) -+ else if (tmp[2].compare(QString("service")) == 0) - { - flags |= 0x08; - } -diff --git c/herqq/hupnp/src/dataelements/hserviceid.cpp i/herqq/hupnp/src/dataelements/hserviceid.cpp -index 9b0fad6..11a8640 100644 ---- c/herqq/hupnp/src/dataelements/hserviceid.cpp -+++ i/herqq/hupnp/src/dataelements/hserviceid.cpp -@@ -64,7 +64,7 @@ public: - return; - } - -- if (tmp[0].compare("urn", Qt::CaseInsensitive) != 0) -+ if (tmp[0].compare(QString("urn"), Qt::CaseInsensitive) != 0) - { - HLOG_WARN_NONSTD( - QString("Invalid service identifier [%1]").arg(arg)); -@@ -72,7 +72,7 @@ public: - return; - } - -- if (tmp[1].compare("upnp-org", Qt::CaseInsensitive) != 0) -+ if (tmp[1].compare(QString("upnp-org"), Qt::CaseInsensitive) != 0) - { - tmp[1] = tmp[1].replace('.', '-'); - if (tmp[1].isEmpty()) -@@ -85,7 +85,7 @@ public: - } - - bool warned = false; -- if (tmp[2].compare("serviceId", Qt::CaseInsensitive) != 0) -+ if (tmp[2].compare(QString("serviceId"), Qt::CaseInsensitive) != 0) - { - HLOG_WARN_NONSTD(QString("Invalid service identifier [%1]").arg(arg)); - warned = true; -diff --git c/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp i/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp -index b3a58fa..d1853e1 100644 ---- c/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp -+++ i/herqq/hupnp/src/devicehosting/hddoc_parser_p.cpp -@@ -195,7 +195,7 @@ bool HDocParser::parseActionArguments( - } - - HActionArgument createdArg; -- if (dirStr.compare("out", Qt::CaseInsensitive) == 0) -+ if (dirStr.compare(QString("out"), Qt::CaseInsensitive) == 0) - { - if (retValWasDefined) - { -@@ -228,7 +228,7 @@ bool HDocParser::parseActionArguments( - - outArgs->push_back(createdArg); - } -- else if (dirStr.compare("in", Qt::CaseInsensitive) == 0) -+ else if (dirStr.compare(QString("in"), Qt::CaseInsensitive) == 0) - { - if (firstOutArgFound) - { -@@ -677,11 +677,11 @@ bool HDocParser::parseStateVariable( - - QString strSendEvents = stateVariableElement.attribute("sendEvents", "no"); - bool bSendEvents = false; -- if (strSendEvents.compare("yes", Qt::CaseInsensitive) == 0) -+ if (strSendEvents.compare(QString("yes"), Qt::CaseInsensitive) == 0) - { - bSendEvents = true; - } -- else if (strSendEvents.compare("no", Qt::CaseInsensitive) != 0) -+ else if (strSendEvents.compare(QString("no"), Qt::CaseInsensitive) != 0) - { - m_lastError = InvalidServiceDescriptionError; - m_lastErrorDescription = QString( -@@ -694,11 +694,11 @@ bool HDocParser::parseStateVariable( - - QString strMulticast = stateVariableElement.attribute("multicast", "no"); - bool bMulticast = false; -- if (strMulticast.compare("yes", Qt::CaseInsensitive) == 0) -+ if (strMulticast.compare(QString("yes"), Qt::CaseInsensitive) == 0) - { - bMulticast = true; - } -- else if (strMulticast.compare("no", Qt::CaseInsensitive) != 0) -+ else if (strMulticast.compare(QString("no"), Qt::CaseInsensitive) != 0) - { - m_lastError = InvalidServiceDescriptionError; - m_lastErrorDescription = QString( -diff --git c/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp i/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp -index 2e375a0..2d6a8cc 100644 ---- c/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp -+++ i/herqq/hupnp/src/devicehosting/messages/hevent_messages_p.cpp -@@ -197,7 +197,7 @@ HSubscribeRequest::RetVal HSubscribeRequest::setContents( - - // this appears to be an initial subscription - -- if (nt.simplified().compare("upnp:event", Qt::CaseInsensitive) != 0) -+ if (nt.simplified().compare(QString("upnp:event"), Qt::CaseInsensitive) != 0) - { - return PreConditionFailed; - } -diff --git c/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp i/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp -index aacdfcf..b618ba7 100644 ---- c/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp -+++ i/herqq/hupnp/src/devicehosting/messages/hnt_p.cpp -@@ -37,7 +37,7 @@ HNt::HNt(const QString& type) : - m_typeValue(qMakePair(Type_Undefined, QString(""))), - m_subTypeValue(qMakePair(SubType_Undefined, QString(""))) - { -- if (type.compare("upnp:event", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("upnp:event"), Qt::CaseInsensitive) == 0) - { - m_typeValue.first = Type_UpnpEvent; - m_typeValue.second = "upnp:event"; -@@ -48,13 +48,13 @@ HNt::HNt(const QString& type, const QString& subtype) : - m_typeValue(qMakePair(Type_Undefined, QString(""))), - m_subTypeValue(qMakePair(SubType_Undefined, QString(""))) - { -- if (type.compare("upnp:event", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("upnp:event"), Qt::CaseInsensitive) == 0) - { - m_typeValue.first = Type_UpnpEvent; - m_typeValue.second = "upnp:event"; - } - -- if (subtype.compare("upnp:propchange", Qt::CaseInsensitive) == 0) -+ if (subtype.compare(QString("upnp:propchange"), Qt::CaseInsensitive) == 0) - { - m_subTypeValue.first = SubType_UpnpPropChange; - m_subTypeValue.second = "upnp:propchange"; -diff --git c/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp i/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp -index 0faf7f4..addbaaf 100644 ---- c/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp -+++ i/herqq/hupnp/src/devicehosting/messages/htimeout_p.cpp -@@ -43,7 +43,7 @@ HTimeout::HTimeout(const QString& timeout) : - m_value(-1) - { - QString tmp(timeout.simplified()); -- if (tmp.compare("infinite", Qt::CaseInsensitive) != 0) -+ if (tmp.compare(QString("infinite"), Qt::CaseInsensitive) != 0) - { - if (tmp.startsWith("Second-", Qt::CaseInsensitive)) - { -diff --git c/herqq/hupnp/src/general/hupnp_datatypes.cpp i/herqq/hupnp/src/general/hupnp_datatypes.cpp -index 9f2084f..ae8e9ae 100644 ---- c/herqq/hupnp/src/general/hupnp_datatypes.cpp -+++ i/herqq/hupnp/src/general/hupnp_datatypes.cpp -@@ -424,15 +424,15 @@ QVariant HUpnpDataTypes::convertToRightVariantType( - - case HUpnpDataTypes::boolean: - { -- if (value.compare("true", Qt::CaseInsensitive) == 0 || -- value.compare("yes", Qt::CaseInsensitive) == 0 || -- value.compare("1") == 0) -+ if (value.compare(QString("true"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("yes"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("1")) == 0) - { - retVal = true; - } -- else if (value.compare("false", Qt::CaseInsensitive) == 0 || -- value.compare("no", Qt::CaseInsensitive) == 0 || -- value.compare("0") == 0) -+ else if (value.compare(QString("false"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("no"), Qt::CaseInsensitive) == 0 || -+ value.compare(QString("0")) == 0) - { - retVal = false; - } -diff --git c/herqq/hupnp/src/http/hhttp_server_p.cpp i/herqq/hupnp/src/http/hhttp_server_p.cpp -index eb1a56c..42e93ca 100644 ---- c/herqq/hupnp/src/http/hhttp_server_p.cpp -+++ i/herqq/hupnp/src/http/hhttp_server_p.cpp -@@ -121,27 +121,27 @@ void HHttpServer::processRequest(HHttpAsyncOperation* op) - mi->setKeepAlive(HHttpUtils::keepAlive(*hdr)); - - QString method = hdr->method(); -- if (method.compare("GET", Qt::CaseInsensitive) == 0) -+ if (method.compare(QString("GET"), Qt::CaseInsensitive) == 0) - { - processGet(op->takeMessagingInfo(), *hdr); - } -- else if (method.compare("HEAD"), Qt::CaseInsensitive) -+ else if (method.compare(QString("HEAD")), Qt::CaseInsensitive) - { - processHead(op->takeMessagingInfo(), *hdr); - } -- else if (method.compare("POST", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("POST"), Qt::CaseInsensitive) == 0) - { - processPost(op->takeMessagingInfo(), *hdr, op->dataRead()); - } -- else if (method.compare("NOTIFY", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("NOTIFY"), Qt::CaseInsensitive) == 0) - { - processNotifyMessage(op->takeMessagingInfo(), *hdr, op->dataRead()); - } -- else if (method.compare("SUBSCRIBE", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("SUBSCRIBE"), Qt::CaseInsensitive) == 0) - { - processSubscription(op->takeMessagingInfo(), *hdr); - } -- else if (method.compare("UNSUBSCRIBE", Qt::CaseInsensitive) == 0) -+ else if (method.compare(QString("UNSUBSCRIBE"), Qt::CaseInsensitive) == 0) - { - processUnsubscription(op->takeMessagingInfo(), *hdr); - } -diff --git c/herqq/hupnp/src/http/hhttp_utils_p.h i/herqq/hupnp/src/http/hhttp_utils_p.h -index 7285190..b3ee62e 100644 ---- c/herqq/hupnp/src/http/hhttp_utils_p.h -+++ i/herqq/hupnp/src/http/hhttp_utils_p.h -@@ -64,10 +64,10 @@ public: - QString connection = hdr.value("CONNECTION"); - if (hdr.minorVersion() == 1) - { -- return connection.compare("close", Qt::CaseInsensitive) != 0; -+ return connection.compare(QString("close"), Qt::CaseInsensitive) != 0; - } - -- return connection.compare("Keep-Alive", Qt::CaseInsensitive) == 0; -+ return connection.compare(QString("Keep-Alive"), Qt::CaseInsensitive) == 0; - } - - // returns the URLs as a string inside brackets. This is the format used in -diff --git c/herqq/hupnp/src/utils/hmisc_utils_p.cpp i/herqq/hupnp/src/utils/hmisc_utils_p.cpp -index 6641d14..7ea567a 100644 ---- c/herqq/hupnp/src/utils/hmisc_utils_p.cpp -+++ i/herqq/hupnp/src/utils/hmisc_utils_p.cpp -@@ -70,10 +70,10 @@ bool toBool(const QString& arg, bool* ok) - bool retVal = false, match = true; - if (arg == "1") { retVal = true; } - else if (arg == "0") { retVal = false; } -- else if (arg.compare("true", Qt::CaseInsensitive) == 0) { retVal = true; } -- else if (arg.compare("false", Qt::CaseInsensitive) == 0) { retVal = false; } -- else if (arg.compare("yes", Qt::CaseInsensitive) == 0) { retVal = true; } -- else if (arg.compare("no", Qt::CaseInsensitive) == 0) { retVal = false; } -+ else if (arg.compare(QString("true"), Qt::CaseInsensitive) == 0) { retVal = true; } -+ else if (arg.compare(QString("false"), Qt::CaseInsensitive) == 0) { retVal = false; } -+ else if (arg.compare(QString("yes"), Qt::CaseInsensitive) == 0) { retVal = true; } -+ else if (arg.compare(QString("no"), Qt::CaseInsensitive) == 0) { retVal = false; } - else { match = false; } - - if (ok) { *ok = match; } -diff --git c/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp i/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp -index 6531929..8bd05c5 100644 ---- c/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp -+++ i/herqq/hupnp_av/src/cds_model/cds_objects/hobject.cpp -@@ -680,15 +680,15 @@ QString HObject::writeStatusToString(WriteStatus status) - HObject::WriteStatus HObject::writeStatusFromString(const QString& status) - { - WriteStatus retVal = UnknownWriteStatus; -- if (status.compare("writable", Qt::CaseInsensitive) == 0) -+ if (status.compare(QString("writable"), Qt::CaseInsensitive) == 0) - { - retVal = WritableWriteStatus; - } -- else if (status.compare("protected", Qt::CaseInsensitive) == 0) -+ else if (status.compare(QString("protected"), Qt::CaseInsensitive) == 0) - { - retVal = ProtectedWriteStatus; - } -- else if (status.compare("mixed", Qt::CaseInsensitive) == 0) -+ else if (status.compare(QString("mixed"), Qt::CaseInsensitive) == 0) - { - retVal = MixedWriteStatus; - } -diff --git c/herqq/hupnp_av/src/cds_model/hmatching_id.cpp i/herqq/hupnp_av/src/cds_model/hmatching_id.cpp -index 25ee560..bea6ece 100644 ---- c/herqq/hupnp_av/src/cds_model/hmatching_id.cpp -+++ i/herqq/hupnp_av/src/cds_model/hmatching_id.cpp -@@ -77,11 +77,11 @@ QString HMatchingId::toString(Type type) - HMatchingId::Type HMatchingId::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("SI_SERIESID", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("SI_SERIESID"), Qt::CaseInsensitive) == 0) - { - retVal = SeriesId; - } -- else if (type.compare("SI_PROGRAMID", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SI_PROGRAMID"), Qt::CaseInsensitive) == 0) - { - retVal = ProgramId; - } -diff --git c/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp i/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp -index 06ab6bf..e7cec20 100644 ---- c/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp -+++ i/herqq/hupnp_av/src/cds_model/hscheduledtime.cpp -@@ -108,11 +108,11 @@ QString HScheduledTime::toString(Type type) - HScheduledTime::Type HScheduledTime::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("SCHEDULED_PROGRAM", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("SCHEDULED_PROGRAM"), Qt::CaseInsensitive) == 0) - { - retVal = ScheduledProgram; - } -- else if (type.compare("ON_DEMAND", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ON_DEMAND"), Qt::CaseInsensitive) == 0) - { - retVal = OnDemand; - } -diff --git c/herqq/hupnp_av/src/cds_model/hsortinfo.cpp i/herqq/hupnp_av/src/cds_model/hsortinfo.cpp -index 078d719..31e1af0 100644 ---- c/herqq/hupnp_av/src/cds_model/hsortinfo.cpp -+++ i/herqq/hupnp_av/src/cds_model/hsortinfo.cpp -@@ -115,19 +115,19 @@ QString HSortModifier::toString(Type type) - HSortModifier::Type HSortModifier::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("+", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("+"), Qt::CaseInsensitive) == 0) - { - retVal = AscendingByValue; - } -- else if (type.compare("-", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("-"), Qt::CaseInsensitive) == 0) - { - retVal = DescendingByValue; - } -- else if (type.compare("TIME+", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TIME+"), Qt::CaseInsensitive) == 0) - { - retVal = AscendingByTime; - } -- else if (type.compare("TIME-", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TIME-"), Qt::CaseInsensitive) == 0) - { - retVal = DescendingByTime; - } -diff --git c/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp i/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp -index 65b67f8..f51e6b2 100644 ---- c/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp -+++ i/herqq/hupnp_av/src/cds_model/hstatevariablecollection.cpp -@@ -198,11 +198,11 @@ HStateVariableCollection::RcsInstanceType HStateVariableCollection::fromString( - const QString& type) - { - RcsInstanceType retVal = Undefined; -- if (type.compare("pre-mix", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("pre-mix"), Qt::CaseInsensitive) == 0) - { - retVal = PreMix; - } -- else if (type.compare("post-mix", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("post-mix"), Qt::CaseInsensitive) == 0) - { - retVal = PostMix; - } -diff --git c/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp i/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp -index 9f5712d..cd4dacb 100644 ---- c/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp -+++ i/herqq/hupnp_av/src/cds_model/model_mgmt/hcds_dlite_serializer.cpp -@@ -568,7 +568,7 @@ bool HCdsDidlLiteSerializer::serializeFromXml( - addNamespaces(reader); - if (reader.readNextStartElement()) - { -- if (reader.name().compare("DIDL-Lite", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("DIDL-Lite"), Qt::CaseInsensitive) != 0) - { - h_ptr->m_lastErrorDescription = "Missing mandatory DIDL-Lite element"; - return false; -diff --git c/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp i/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp -index 30af243..af03c5c 100644 ---- c/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp -+++ i/herqq/hupnp_av/src/cds_model/model_mgmt/hcdsproperty_db.cpp -@@ -749,7 +749,7 @@ bool HCdsPropertyDbPrivate::serializeSvCollectionIn( - - if (stateVariableReader.readNextStartElement()) - { -- if (stateVariableReader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ if (stateVariableReader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return false; - } -diff --git c/herqq/hupnp_av/src/common/hradioband.cpp i/herqq/hupnp_av/src/common/hradioband.cpp -index d35a559..85b7e32 100644 ---- c/herqq/hupnp_av/src/common/hradioband.cpp -+++ i/herqq/hupnp_av/src/common/hradioband.cpp -@@ -83,23 +83,23 @@ QString HRadioBand::toString(Type type) - HRadioBand::Type HRadioBand::fromString(const QString& arg) - { - Type retVal = Undefined; -- if (arg.compare("am", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("am"), Qt::CaseInsensitive) == 0) - { - retVal = AM; - } -- else if (arg.compare("fm", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("fm"), Qt::CaseInsensitive) == 0) - { - retVal = FM; - } -- else if (arg.compare("shortwave", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("shortwave"), Qt::CaseInsensitive) == 0) - { - retVal = ShortWave; - } -- else if (arg.compare("internet", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("internet"), Qt::CaseInsensitive) == 0) - { - retVal = Internet; - } -- else if (arg.compare("satellite", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("satellite"), Qt::CaseInsensitive) == 0) - { - retVal = Satellite; - } -diff --git c/herqq/hupnp_av/src/common/hstoragemedium.cpp i/herqq/hupnp_av/src/common/hstoragemedium.cpp -index 37ab7e0..c7f2109 100644 ---- c/herqq/hupnp_av/src/common/hstoragemedium.cpp -+++ i/herqq/hupnp_av/src/common/hstoragemedium.cpp -@@ -187,155 +187,155 @@ QString HStorageMedium::toString(Type type) - HStorageMedium::Type HStorageMedium::fromString(const QString& type) - { - Type retVal = Unknown; -- if (type.compare("UNKNOWN", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("UNKNOWN"), Qt::CaseInsensitive) == 0) - { - retVal = Unknown; - } -- else if (type.compare("DV", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DV"), Qt::CaseInsensitive) == 0) - { - retVal = DigitalVideo; - } -- else if (type.compare("VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VHS"), Qt::CaseInsensitive) == 0) - { - retVal = VHS; - } -- else if (type.compare("W-VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("W-VHS"), Qt::CaseInsensitive) == 0) - { - retVal = W_VHS; - } -- else if (type.compare("S-VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("S-VHS"), Qt::CaseInsensitive) == 0) - { - retVal = S_VHS; - } -- else if (type.compare("D_VHS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("D_VHS"), Qt::CaseInsensitive) == 0) - { - retVal = D_VHS; - } -- else if (type.compare("VHSC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VHSC"), Qt::CaseInsensitive) == 0) - { - retVal = VHSC; - } -- else if (type.compare("VIDEO8", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VIDEO8"), Qt::CaseInsensitive) == 0) - { - retVal = Video8; - } -- else if (type.compare("HI8", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("HI8"), Qt::CaseInsensitive) == 0) - { - retVal = HI8; - } -- else if (type.compare("CD-ROM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-ROM"), Qt::CaseInsensitive) == 0) - { - retVal = CD_ROM; - } -- else if (type.compare("CD-DA", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-DA"), Qt::CaseInsensitive) == 0) - { - retVal = CD_DA; - } -- else if (type.compare("CD-R", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-R"), Qt::CaseInsensitive) == 0) - { - retVal = CD_R; - } -- else if (type.compare("CD-RW", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CD-RW"), Qt::CaseInsensitive) == 0) - { - retVal = CD_RW; - } -- else if (type.compare("VIDEO-CD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("VIDEO-CD"), Qt::CaseInsensitive) == 0) - { - retVal = Video_CD; - } -- else if (type.compare("SACD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SACD"), Qt::CaseInsensitive) == 0) - { - retVal = SACD; - } -- else if (type.compare("MD-AUDIO", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MD-AUDIO"), Qt::CaseInsensitive) == 0) - { - retVal = MiniDiscAudio; - } -- else if (type.compare("MD-PICTURE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MD-PICTURE"), Qt::CaseInsensitive) == 0) - { - retVal = MiniDiscPicture; - } -- else if (type.compare("DVD-ROM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-ROM"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_ROM; - } -- else if (type.compare("DVD-VIDEO", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-VIDEO"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_Video; - } -- else if (type.compare("DVD+R", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD+R"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_PlusRecordable; - } -- else if (type.compare("DVD-R", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-R"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_MinusRecordable; - } -- else if (type.compare("DVD+RW", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD+RW"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_PlusRewritable; - } -- else if (type.compare("DVD-RW", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-RW"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_MinusRewritable; - } -- else if (type.compare("DVD-RAM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DVD-RAM"), Qt::CaseInsensitive) == 0) - { - retVal = DVD_RAM; - } -- else if (type.compare("DAT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DAT"), Qt::CaseInsensitive) == 0) - { - retVal = DAT; - } -- else if (type.compare("LD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LD"), Qt::CaseInsensitive) == 0) - { - retVal = LD; - } -- else if (type.compare("HDD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("HDD"), Qt::CaseInsensitive) == 0) - { - retVal = HDD; - } -- else if (type.compare("MICRO-MV", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MICRO-MV"), Qt::CaseInsensitive) == 0) - { - retVal = MicroMV; - } -- else if (type.compare("NETWORK", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NETWORK"), Qt::CaseInsensitive) == 0) - { - retVal = Network; - } -- else if (type.compare("NONE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NONE"), Qt::CaseInsensitive) == 0) - { - retVal = None; - } -- else if (type.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0) - { - retVal = NotImplemented; - } -- else if (type.compare("SD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SD"), Qt::CaseInsensitive) == 0) - { - retVal = SecureDigital; - } -- else if (type.compare("PC-CARD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PC-CARD"), Qt::CaseInsensitive) == 0) - { - retVal = PC_Card; - } -- else if (type.compare("MMC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MMC"), Qt::CaseInsensitive) == 0) - { - retVal = MultimediaCard; - } -- else if (type.compare("CF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CF"), Qt::CaseInsensitive) == 0) - { - retVal = CompactFlash; - } -- else if (type.compare("BD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("BD"), Qt::CaseInsensitive) == 0) - { - retVal = BluRay; - } -- else if (type.compare("MS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("MS"), Qt::CaseInsensitive) == 0) - { - retVal = MemoryStick; - } -- else if (type.compare("HD_DVD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("HD_DVD"), Qt::CaseInsensitive) == 0) - { - retVal = HD_DVD; - } -diff --git c/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp i/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp -index 89d44ae..bb364b5 100644 ---- c/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp -+++ i/herqq/hupnp_av/src/connectionmanager/hconnectionmanager_info.cpp -@@ -57,11 +57,11 @@ HConnectionManagerInfo::Direction - HConnectionManagerInfo::directionFromString(const QString& arg) - { - Direction retVal = DirectionUndefined; -- if (arg.compare("Input", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("Input"), Qt::CaseInsensitive) == 0) - { - retVal = DirectionInput; - } -- else if (arg.compare("Output", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("Output"), Qt::CaseInsensitive) == 0) - { - retVal = DirectionOutput; - } -@@ -92,23 +92,23 @@ HConnectionManagerInfo::ConnectionStatus - HConnectionManagerInfo::statusFromString(const QString& arg) - { - ConnectionStatus retVal = StatusUnknown; -- if (arg.compare("Ok", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("Ok"), Qt::CaseInsensitive) == 0) - { - retVal = StatusOk; - } -- else if (arg.compare("Unknown", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("Unknown"), Qt::CaseInsensitive) == 0) - { - retVal = StatusUnknown; - } -- else if (arg.compare("ContentFormatMismatch", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("ContentFormatMismatch"), Qt::CaseInsensitive) == 0) - { - retVal = StatusContentFormatMismatch; - } -- else if (arg.compare("InsufficientBandwidth", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("InsufficientBandwidth"), Qt::CaseInsensitive) == 0) - { - retVal = StatusInsufficientBandwidth; - } -- else if (arg.compare("UnreliableChannel", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("UnreliableChannel"), Qt::CaseInsensitive) == 0) - { - retVal = StatusUnreliableChannel; - } -diff --git c/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp i/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp -index 5c0c0d0..743ed1e 100644 ---- c/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp -+++ i/herqq/hupnp_av/src/contentdirectory/hcontentdirectory_info.cpp -@@ -80,11 +80,11 @@ HContentDirectoryInfo::BrowseFlag - HContentDirectoryInfo::browseFlagFromString(const QString& arg) - { - BrowseFlag retVal = Undefined; -- if (arg.compare("BrowseMetadata", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("BrowseMetadata"), Qt::CaseInsensitive) == 0) - { - retVal = BrowseMetadata; - } -- else if (arg.compare("BrowseDirectChildren", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("BrowseDirectChildren"), Qt::CaseInsensitive) == 0) - { - retVal = BrowseDirectChildren; - } -diff --git c/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp i/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp -index 0a663dc..1771b6f 100644 ---- c/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp -+++ i/herqq/hupnp_av/src/contentdirectory/htransferprogressinfo.cpp -@@ -85,15 +85,15 @@ HTransferProgressInfo::~HTransferProgressInfo() - HTransferProgressInfo::Status HTransferProgressInfo::fromString(const QString& arg) - { - Status retVal = Error; -- if (arg.compare("IN_PROGRESS", Qt::CaseInsensitive) == 0) -+ if (arg.compare(QString("IN_PROGRESS"), Qt::CaseInsensitive) == 0) - { - retVal = InProgress; - } -- else if (arg.compare("STOPPED", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("STOPPED"), Qt::CaseInsensitive) == 0) - { - retVal = Stopped; - } -- else if (arg.compare("COMPLETED", Qt::CaseInsensitive) == 0) -+ else if (arg.compare(QString("COMPLETED"), Qt::CaseInsensitive) == 0) - { - retVal = Completed; - } -diff --git c/herqq/hupnp_av/src/hav_global.cpp i/herqq/hupnp_av/src/hav_global.cpp -index c3f93a9..27d98a0 100644 ---- c/herqq/hupnp_av/src/hav_global.cpp -+++ i/herqq/hupnp_av/src/hav_global.cpp -@@ -647,7 +647,7 @@ HStateVariableCollection parseStateVariableCollection(const QString& arg) - addNamespaces(reader); - - if (!reader.readNextStartElement() || -- reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return retVal; - } -diff --git c/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp i/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp -index f9e2dc4..69b7648 100644 ---- c/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp -+++ i/herqq/hupnp_av/src/mediabrowser/hmediabrowser.cpp -@@ -287,7 +287,7 @@ void HMediaBrowserPrivate::lastChangeReceived( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("StateEvent", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("StateEvent"), Qt::CaseInsensitive) != 0) - { - return; - } -diff --git c/herqq/hupnp_av/src/mediarenderer/hconnection.cpp i/herqq/hupnp_av/src/mediarenderer/hconnection.cpp -index 651e727..9fb4958 100644 ---- c/herqq/hupnp_av/src/mediarenderer/hconnection.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/hconnection.cpp -@@ -144,7 +144,7 @@ void HConnection::lastChangeReceived( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("Event", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("Event"), Qt::CaseInsensitive) != 0) - { - return; - } -@@ -159,7 +159,7 @@ void HConnection::lastChangeReceived( - { - QStringRef name = reader.name(); - -- if (name.compare("InstanceID", Qt::CaseInsensitive)) -+ if (name.compare(QString("InstanceID"), Qt::CaseInsensitive)) - { - continue; - } -@@ -205,7 +205,7 @@ void HConnection::lastChangeReceived(HAvTransportAdapter*, const QString& data) - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("Event", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("Event"), Qt::CaseInsensitive) != 0) - { - return; - } -@@ -220,7 +220,7 @@ void HConnection::lastChangeReceived(HAvTransportAdapter*, const QString& data) - { - QStringRef name = reader.name(); - -- if (name.compare("InstanceID", Qt::CaseInsensitive)) -+ if (name.compare(QString("InstanceID"), Qt::CaseInsensitive)) - { - continue; - } -diff --git c/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp i/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp -index 174f423..bf7e9f2 100644 ---- c/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/hconnectionmanager_sinkservice_p.cpp -@@ -109,7 +109,7 @@ qint32 HConnectionManagerSinkService::prepareForConnection( - return HConnectionManagerInfo::IncompatibleDirections; - } - -- if (remoteProtocolInfo.protocol().compare("http-get", Qt::CaseInsensitive) && -+ if (remoteProtocolInfo.protocol().compare(QString("http-get"), Qt::CaseInsensitive) && - remoteProtocolInfo.protocol() != "*") - { - return HConnectionManagerInfo::IncompatibleProtocolInfo; -diff --git c/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp i/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp -index 1ad337a..0f5e209 100644 ---- c/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/hrendererconnection_info.cpp -@@ -1578,19 +1578,19 @@ bool HRendererConnectionInfo::hasChannelAssociated(const QString& svName) - { - bool retVal = false; - QString trimmed = svName.trimmed(); -- if (trimmed.compare("Mute", Qt::CaseInsensitive) == 0) -+ if (trimmed.compare(QString("Mute"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -- else if (trimmed.compare("Volume", Qt::CaseInsensitive) == 0) -+ else if (trimmed.compare(QString("Volume"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -- else if (trimmed.compare("VolumeDB", Qt::CaseInsensitive) == 0) -+ else if (trimmed.compare(QString("VolumeDB"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -- else if (trimmed.compare("Loudness", Qt::CaseInsensitive) == 0) -+ else if (trimmed.compare(QString("Loudness"), Qt::CaseInsensitive) == 0) - { - retVal = true; - } -diff --git c/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp i/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp -index a614e17..fbb3258 100644 ---- c/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp -+++ i/herqq/hupnp_av/src/mediarenderer/htransport_sinkservice_p.cpp -@@ -449,7 +449,7 @@ qint32 HTransportSinkService::getStateVariables( - foreach(QString svName, stateVarNames) - { - svName = svName.trimmed(); -- if (svName.compare("LastChange", Qt::CaseInsensitive) == 0 || -+ if (svName.compare(QString("LastChange"), Qt::CaseInsensitive) == 0 || - svName.startsWith("A_ARG", Qt::CaseInsensitive)) - { - return HAvTransportInfo::InvalidStateVariableList; -@@ -512,7 +512,7 @@ qint32 HTransportSinkService::setStateVariables( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return UpnpInvalidArgs; - } -diff --git c/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp i/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp -index 751a3d9..51c1ff4 100644 ---- c/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp -+++ i/herqq/hupnp_av/src/renderingcontrol/hchannel.cpp -@@ -110,59 +110,59 @@ QString HChannel::toString(Type type) - HChannel::Type HChannel::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("MASTER", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("MASTER"), Qt::CaseInsensitive) == 0) - { - retVal = Master; - } -- else if (type.compare("LF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LF"), Qt::CaseInsensitive) == 0) - { - retVal = LeftFront; - } -- else if (type.compare("RF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RF"), Qt::CaseInsensitive) == 0) - { - retVal = RightFront; - } -- else if (type.compare("CF", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CF"), Qt::CaseInsensitive) == 0) - { - retVal = CenterFront; - } -- else if (type.compare("LFE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LFE"), Qt::CaseInsensitive) == 0) - { - retVal = LFE; - } -- else if (type.compare("LS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LS"), Qt::CaseInsensitive) == 0) - { - retVal = LeftSurround; - } -- else if (type.compare("RS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RS"), Qt::CaseInsensitive) == 0) - { - retVal = RightSurround; - } -- else if (type.compare("LFC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("LFC"), Qt::CaseInsensitive) == 0) - { - retVal = LeftOfCenter; - } -- else if (type.compare("RFC", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RFC"), Qt::CaseInsensitive) == 0) - { - retVal = RightOfCenter; - } -- else if (type.compare("SD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SD"), Qt::CaseInsensitive) == 0) - { - retVal = Surround; - } -- else if (type.compare("SL", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SL"), Qt::CaseInsensitive) == 0) - { - retVal = SideLeft; - } -- else if (type.compare("SR", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SR"), Qt::CaseInsensitive) == 0) - { - retVal = SideRight; - } -- else if (type.compare("T", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("T"), Qt::CaseInsensitive) == 0) - { - retVal = Top; - } -- else if (type.compare("B", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("B"), Qt::CaseInsensitive) == 0) - { - retVal = Bottom; - } -diff --git c/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp i/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp -index fd52f9a..84f5579 100644 ---- c/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp -+++ i/herqq/hupnp_av/src/renderingcontrol/hrenderingcontrol_service_p.cpp -@@ -859,7 +859,7 @@ qint32 HRenderingControlService::setStateVariables( - - if (reader.readNextStartElement()) - { -- if (reader.name().compare("stateVariableValuePairs", Qt::CaseInsensitive) != 0) -+ if (reader.name().compare(QString("stateVariableValuePairs"), Qt::CaseInsensitive) != 0) - { - return UpnpInvalidArgs; - } -diff --git c/herqq/hupnp_av/src/transport/havtransport_info.cpp i/herqq/hupnp_av/src/transport/havtransport_info.cpp -index cb18ce0..e3fcd64 100644 ---- c/herqq/hupnp_av/src/transport/havtransport_info.cpp -+++ i/herqq/hupnp_av/src/transport/havtransport_info.cpp -@@ -94,35 +94,35 @@ HAvTransportInfo::DrmState - HAvTransportInfo::drmStateFromString(const QString& state) - { - DrmState retVal = DrmState_Unknown; -- if (state.compare("OK", Qt::CaseInsensitive) == 0) -+ if (state.compare(QString("OK"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_Ok; - } -- else if (state.compare("UNKNOWN", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("UNKNOWN"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_Unknown; - } -- else if (state.compare("PROCESSING_CONTENT_KEY", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("PROCESSING_CONTENT_KEY"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_ProcessingContentKey; - } -- else if (state.compare("CONTENT_KEY_FAILURE", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("CONTENT_KEY_FAILURE"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_ContentKeyFailure; - } -- else if (state.compare("ATTEMPTING_AUTHENTICATION", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("ATTEMPTING_AUTHENTICATION"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_AttemptingAuthentication; - } -- else if (state.compare("FAILED_AUTHENTICATION", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("FAILED_AUTHENTICATION"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_FailedAuthentication; - } -- else if (state.compare("NOT_AUTHENTICATED", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("NOT_AUTHENTICATED"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_NotAuthenticated; - } -- else if (state.compare("DEVICE_REVOCATION", Qt::CaseInsensitive) == 0) -+ else if (state.compare(QString("DEVICE_REVOCATION"), Qt::CaseInsensitive) == 0) - { - retVal = DrmState_DeviceRevocation; - } -diff --git c/herqq/hupnp_av/src/transport/hmediainfo.cpp i/herqq/hupnp_av/src/transport/hmediainfo.cpp -index 9e642c1..5f33847 100644 ---- c/herqq/hupnp_av/src/transport/hmediainfo.cpp -+++ i/herqq/hupnp_av/src/transport/hmediainfo.cpp -@@ -180,15 +180,15 @@ HMediaInfo::MediaCategory HMediaInfo::mediaCategoryFromString( - const QString& category) - { - MediaCategory retVal = Undefined; -- if (category.compare("NO_MEDIA", Qt::CaseInsensitive) == 0) -+ if (category.compare(QString("NO_MEDIA"), Qt::CaseInsensitive) == 0) - { - retVal = NoMedia; - } -- else if (category.compare("TRACK_AWARE", Qt::CaseInsensitive) == 0) -+ else if (category.compare(QString("TRACK_AWARE"), Qt::CaseInsensitive) == 0) - { - retVal = TrackAware; - } -- else if (category.compare("TRACK_UNAWARE", Qt::CaseInsensitive) == 0) -+ else if (category.compare(QString("TRACK_UNAWARE"), Qt::CaseInsensitive) == 0) - { - retVal = TrackUnaware; - } -diff --git c/herqq/hupnp_av/src/transport/hplaymode.cpp i/herqq/hupnp_av/src/transport/hplaymode.cpp -index 8d3a20e..57605f0 100644 ---- c/herqq/hupnp_av/src/transport/hplaymode.cpp -+++ i/herqq/hupnp_av/src/transport/hplaymode.cpp -@@ -87,31 +87,31 @@ QString HPlayMode::toString(HPlayMode::Type type) - HPlayMode::Type HPlayMode::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("NORMAL", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("NORMAL"), Qt::CaseInsensitive) == 0) - { - retVal = Normal; - } -- else if (type.compare("SHUFFLE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SHUFFLE"), Qt::CaseInsensitive) == 0) - { - retVal = Shuffle; - } -- else if (type.compare("REPEAT_ONE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REPEAT_ONE"), Qt::CaseInsensitive) == 0) - { - retVal = RepeatOne; - } -- else if (type.compare("REPEAT_ALL", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REPEAT_ALL"), Qt::CaseInsensitive) == 0) - { - retVal = RepeatAll; - } -- else if (type.compare("RANDOM", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RANDOM"), Qt::CaseInsensitive) == 0) - { - retVal = Random; - } -- else if (type.compare("DIRECT_1", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("DIRECT_1"), Qt::CaseInsensitive) == 0) - { - retVal = Direct_1; - } -- else if (type.compare("INTRO", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("INTRO"), Qt::CaseInsensitive) == 0) - { - retVal = Intro; - } -diff --git c/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp i/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp -index ab29f09..a1a5de0 100644 ---- c/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp -+++ i/herqq/hupnp_av/src/transport/hrecordmediumwritestatus.cpp -@@ -81,23 +81,23 @@ HRecordMediumWriteStatus::Type HRecordMediumWriteStatus::fromString( - const QString& type) - { - Type retVal = Unknown; -- if (type.compare("WRITABLE", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("WRITABLE"), Qt::CaseInsensitive) == 0) - { - retVal = Writable; - } -- else if (type.compare("PROTECTED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PROTECTED"), Qt::CaseInsensitive) == 0) - { - retVal = Protected; - } -- else if (type.compare("NOT_WRITABLE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NOT_WRITABLE"), Qt::CaseInsensitive) == 0) - { - retVal = NotWritable; - } -- else if (type.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0) - { - retVal = NotImplemented; - } -- else if (type.compare("UNKNOWN", Qt::CaseInsensitive) != 0 && !type.isEmpty()) -+ else if (type.compare(QString("UNKNOWN"), Qt::CaseInsensitive) != 0 && !type.isEmpty()) - { - retVal = VendorDefined; - } -diff --git c/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp i/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp -index bf7dd90..b659fd7 100644 ---- c/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp -+++ i/herqq/hupnp_av/src/transport/hrecordqualitymode.cpp -@@ -88,31 +88,31 @@ QString HRecordQualityMode::toString(Type mode) - HRecordQualityMode::Type HRecordQualityMode::fromString(const QString& mode) - { - Type retVal = Undefined; -- if (mode.compare("0:EP", Qt::CaseInsensitive) == 0) -+ if (mode.compare(QString("0:EP"), Qt::CaseInsensitive) == 0) - { - retVal = Ep; - } -- else if (mode.compare("1:LP", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("1:LP"), Qt::CaseInsensitive) == 0) - { - retVal = Lp; - } -- else if (mode.compare("2:SP", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("2:SP"), Qt::CaseInsensitive) == 0) - { - retVal = Sp; - } -- else if (mode.compare("0:BASIC", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("0:BASIC"), Qt::CaseInsensitive) == 0) - { - retVal = Basic; - } -- else if (mode.compare("1:MEDIUM", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("1:MEDIUM"), Qt::CaseInsensitive) == 0) - { - retVal = Medium; - } -- else if (mode.compare("2:HIGH", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("2:HIGH"), Qt::CaseInsensitive) == 0) - { - retVal = High; - } -- else if (mode.compare("NOT_IMPLEMENTED", Qt::CaseInsensitive) == 0) -+ else if (mode.compare(QString("NOT_IMPLEMENTED"), Qt::CaseInsensitive) == 0) - { - retVal = NotImplemented; - } -diff --git c/herqq/hupnp_av/src/transport/hseekinfo.cpp i/herqq/hupnp_av/src/transport/hseekinfo.cpp -index c2ac69a..d3eee2b 100644 ---- c/herqq/hupnp_av/src/transport/hseekinfo.cpp -+++ i/herqq/hupnp_av/src/transport/hseekinfo.cpp -@@ -102,43 +102,43 @@ QString HSeekMode::toString(Type type) - HSeekMode::Type HSeekMode::fromString(const QString& type) - { - Type retVal = Unknown; -- if (type.compare("TRACK_NR", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("TRACK_NR"), Qt::CaseInsensitive) == 0) - { - retVal = TrackNr; - } -- else if (type.compare("ABS_TIME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ABS_TIME"), Qt::CaseInsensitive) == 0) - { - retVal = AbsTime; - } -- else if (type.compare("REL_TIME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_TIME"), Qt::CaseInsensitive) == 0) - { - retVal = RelTime; - } -- else if (type.compare("ABS_COUNT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ABS_COUNT"), Qt::CaseInsensitive) == 0) - { - retVal = AbsCount; - } -- else if (type.compare("REL_COUNT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_COUNT"), Qt::CaseInsensitive) == 0) - { - retVal = RelCount; - } -- else if (type.compare("CHANNEL_FREQ", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("CHANNEL_FREQ"), Qt::CaseInsensitive) == 0) - { - retVal = ChannelFreq; - } -- else if (type.compare("TAPE-INDEX", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TAPE-INDEX"), Qt::CaseInsensitive) == 0) - { - retVal = TapeIndex; - } -- else if (type.compare("REL_TAPE-INDEX", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_TAPE-INDEX"), Qt::CaseInsensitive) == 0) - { - retVal = RelTapeIndex; - } -- else if (type.compare("FRAME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("FRAME"), Qt::CaseInsensitive) == 0) - { - retVal = Frame; - } -- else if (type.compare("REL_FRAME", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("REL_FRAME"), Qt::CaseInsensitive) == 0) - { - retVal = RelFrame; - } -diff --git c/herqq/hupnp_av/src/transport/htransportaction.cpp i/herqq/hupnp_av/src/transport/htransportaction.cpp -index d64b1bc..4a34b8d 100644 ---- c/herqq/hupnp_av/src/transport/htransportaction.cpp -+++ i/herqq/hupnp_av/src/transport/htransportaction.cpp -@@ -91,31 +91,31 @@ QString HTransportAction::toString(Type type) - HTransportAction::Type HTransportAction::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("PLAY", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("PLAY"), Qt::CaseInsensitive) == 0) - { - retVal = Play; - } -- else if (type.compare("STOP", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("STOP"), Qt::CaseInsensitive) == 0) - { - retVal = Stop; - } -- else if (type.compare("PAUSE", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PAUSE"), Qt::CaseInsensitive) == 0) - { - retVal = Pause; - } -- else if (type.compare("SEEK", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("SEEK"), Qt::CaseInsensitive) == 0) - { - retVal = Seek; - } -- else if (type.compare("NEXT", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("NEXT"), Qt::CaseInsensitive) == 0) - { - retVal = Next; - } -- else if (type.compare("PREVIOUS", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PREVIOUS"), Qt::CaseInsensitive) == 0) - { - retVal = Previous; - } -- else if (type.compare("RECORD", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RECORD"), Qt::CaseInsensitive) == 0) - { - retVal = Record; - } -diff --git c/herqq/hupnp_av/src/transport/htransportinfo.cpp i/herqq/hupnp_av/src/transport/htransportinfo.cpp -index ecfaf0b..8ca9b1c 100644 ---- c/herqq/hupnp_av/src/transport/htransportinfo.cpp -+++ i/herqq/hupnp_av/src/transport/htransportinfo.cpp -@@ -71,11 +71,11 @@ QString HTransportStatus::toString(HTransportStatus::Type type) - HTransportStatus::Type HTransportStatus::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("OK", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("OK"), Qt::CaseInsensitive) == 0) - { - retVal = OK; - } -- else if (type.compare("ERROR_OCCURRED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("ERROR_OCCURRED"), Qt::CaseInsensitive) == 0) - { - retVal = ErrorOccurred; - } -diff --git c/herqq/hupnp_av/src/transport/htransportstate.cpp i/herqq/hupnp_av/src/transport/htransportstate.cpp -index b460065..f2a1ac3 100644 ---- c/herqq/hupnp_av/src/transport/htransportstate.cpp -+++ i/herqq/hupnp_av/src/transport/htransportstate.cpp -@@ -89,31 +89,31 @@ QString HTransportState::toString(HTransportState::Type type) - HTransportState::Type HTransportState::fromString(const QString& type) - { - Type retVal = Undefined; -- if (type.compare("NO_MEDIA_PRESENT", Qt::CaseInsensitive) == 0) -+ if (type.compare(QString("NO_MEDIA_PRESENT"), Qt::CaseInsensitive) == 0) - { - retVal = NoMediaPresent; - } -- else if (type.compare("STOPPED", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("STOPPED"), Qt::CaseInsensitive) == 0) - { - retVal = Stopped; - } -- else if (type.compare("PLAYING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PLAYING"), Qt::CaseInsensitive) == 0) - { - retVal = Playing; - } -- else if (type.compare("TRANSITIONING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("TRANSITIONING"), Qt::CaseInsensitive) == 0) - { - retVal = Transitioning; - } -- else if (type.compare("PAUSED_PLAYBACK", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PAUSED_PLAYBACK"), Qt::CaseInsensitive) == 0) - { - retVal = PausedPlayback; - } -- else if (type.compare("PAUSED_RECORDING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("PAUSED_RECORDING"), Qt::CaseInsensitive) == 0) - { - retVal = PausedRecording; - } -- else if (type.compare("RECORDING", Qt::CaseInsensitive) == 0) -+ else if (type.compare(QString("RECORDING"), Qt::CaseInsensitive) == 0) - { - retVal = Recording; - } From 374e8f4e28114547f052495b83e73031d22c751a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Apr 2019 22:22:53 -0400 Subject: [PATCH 3/3] pharo: remove resource files These should be checked into upstream --- pkgs/development/pharo/vm/build-vm-legacy.nix | 1 - .../share/icons/hicolor/16x16/apps/pharo.png | Bin 902 -> 0 bytes .../share/icons/hicolor/256x256/apps/pharo.png | Bin 52181 -> 0 bytes .../share/icons/hicolor/32x32/apps/pharo.png | Bin 2368 -> 0 bytes .../share/icons/hicolor/48x48/apps/pharo.png | Bin 4602 -> 0 bytes .../share/mime/packages/pharo-image.xml | 9 --------- pkgs/development/pharo/vm/share.nix | 4 +--- 7 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png delete mode 100644 pkgs/development/pharo/vm/resources/share/icons/hicolor/256x256/apps/pharo.png delete mode 100644 pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png delete mode 100644 pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png delete mode 100644 pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index f2fd6eebd56..bd84dd06e7f 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { preConfigure = '' cd build/ ''; - resources = ./resources; installPhase = '' mkdir -p "$prefix/lib/$name" diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png deleted file mode 100644 index 7910e17ebc49ab5b0f4404ca5afd661747589b19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 902 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 diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png deleted file mode 100644 index ec8a5f95c6c4103616e68eb4186bbe36cea6e5f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2368 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}Y)RhkE)4%caKYZ?lNlHo zI14-?iy0WWg+Z8+Vb&Z81_lQ95>H=O_B)&${1);b+)qU^FmRmpba4!cIDB?`^_0+1 z+2i*6YtPl55q@TSz~Hbn*BRDl21|Z;Y-Zvt<_WnMw@cQ&PlVaTiS69!9{P^>u`rNBmt{iFOm6kBi zlhM`Heb4*nX7zRE4_}YR%`ZJ(e@m{qpnAF8&h_E*b6;NG%Kqz4Hv8|=;%cYuk-1Nq~~I!xj`|BN2oW`Gjiz?+1p|Jc0ImyThIRY+Ml1F zC$F9Q?pDHcmHzudUgM~%)eJ|oBK#be>~%0WNRg>)fjv-!aXW+!~Xf7QmmIB z5BAaKkO+Su5iFD%;@NX?siBsyLdlj%R<}%(FIF0Vzqh~ezW=o~kzBPN@p*68iomX#X8lt=9$ha*3z=RQyb1`tqIoUyisrG; zCzf2cSl;1KZq#gF#q_@9%i3K?lhgxvOJpX*H!wI3xzpZ}B?|gUWSL=JJ zHt|2DzeCx-zlpkQ@c2tLoAc_(<&z5gN*+X5xUJC9JkoJcxY@ADknJPSJVS-1_dhH4 zosT`g=j7kl-vsn^4q3V(IO#H1E%Yy2cCR#5>fEqnbpVmT%?q5y8Q2LHphQ7rFEUwx_Kq?@D$D7CB~6C z5*zfTua;zP{Zn-GvFXRQ%T{JO^X4Wm`1>wDFg(1xTg!T_yruQ)32R!ngr-f^x}5Fx zv1j__7@lLNdCyn;nAiTi+C@oFX`_a`bW2yc(hvQuhMO19Eivm}by)Mt#0f5DSM=j+ z4(^o}JI{82eMQ8t0G-)>^0I-}WtD0nUypKXNQUZ3#y2T-Fa|mX&M8)}n6TnO!3~#5 zviJW>1_g9%R-E}PO)Y1qfOvm$uGIPOD`nnH`giCQYiju4Ri9oko0m#92#Ti8x4Lxg z+a%L_GkQW#ws{>pbjNG{rbQOVo@_Cl=lE%x`J~_C6YpG?NV*!@a&>XRKL1T`6;wYz zOHM9y%Iuk*BtBDw75j-=FZ->>FwiUf#(J19?cQzbj$d_ma1^U@-S0N zmXz?a1sk_oFFqS9dFwaRq=lb4Z#5++9OL<4{cMJS^Zg26(dW5!Q{P2sx-VY(rFX@m z+xlt8wDlF|&FA+$XtmTPZ`n7sVD>iFfQcnGkF1qF5*9ADS1_H>=%M2Nz3_oE`^=gb zl7^M#0$o|zA7-C>*b(mZ@uzsfzsvnXntE1=^E(1koqo-^f98#=axKH-YTIT%wMIVo z=O=cs|7678AVXz5KwYllEpx0SRh5773iGZ_(${MS9vggb{!>MABTV;EG z@2-CJuzXkN_IT5_Q-M#_1uYiXRr8g-eY@xNFK0{PBV6vcN;WY+`l;M{-P(v}rpu>u zi{1xqb7u8_F!Af}%12L~E0%_yv0gmu{294cD{p~0H#AMv=X!tn@`l~ye1nbt4U1

bsN^JZG7%XFuOFFNbK z?#Qavs#vC>^fK>&OV%;rGTA@9KQ=z{IPzt}`|pchRlIq7#9+s&XFd*mH5GL)N>7RU zn#NRznF=;4dmiu2p1dZLxtW>uxyb7Y?6VI4jy0QWu~5dpa!2W2-{o;K5?}JSH6CSU zyg1|h!K1>3m22DEin~@RZ{VA(fB2lH;MO-%1%DFPCp)(2u7%^6wR1ypCz{O<%-%@nL|^7rsxs&3{jLeBi3)6KTQtPlqO4 z&U>ks_)u&BXaliE}GH9Z1uB>?Ik(h5&cuy`7wbth~-ITIG-{yL& z*lgaD7RQ&Z_e~4xG|%}RBU#4N*46GD^0R#U<72S`t3JHsIvu(-^3`I-nFkW*s&46f zpXd4i+s^f8Vt&ob{W)bS`?nHVFQ35K!UtLzr>3^P*|Uss`GYyqX3fFvXTLM|%LT=~ z6wI49W9gNMO^JRdE<{-woth+@_E~zm|19CPvz@l(zF#@}lBRaF=bf^r?%t=9^H<27 z?rOjN`{%J+a!OAQFwZu2ej&2B@7|1&tM}izD_;y|hl)pR3|lF0Jt5Xe_att*5x2ApB${eZLn=0S&)y#f|?VU}3Kg>1XvVZ;Ti%;64DqeRL`s~U7 zoyyGlGr0b^gQuRn(n7A%#ojv$k_<0vFY3`2)NyJ}uUzH4plg#M&ETf zzghRbW%<#at9HE;X?<#|ueNHZ)8!AxW$pcVcBG!1mr^I>D7sugQ&YuwMsZg1TCrY@ z1w}q5>v%8eFDc85DSI(3d)Cn(E4c0d+%3p>d&E9}zm1{58UD@d0u6;lJ{Cz{v<$rc wNb;^o|L670*UjyCQi4~BbbYA*`$s(B#_}Em^^boU7#J8lUHx3vIVCg!01gy=a{vGU diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png deleted file mode 100644 index 3f206cf8b18cf18ae1597a0472d3147f24c7d885..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4602 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FH=O_B)&${1$o(XP!!CU=VEgba4#Hxc4@yx+FGr z>i@Uzt^0qU+wD2oEOT~1*!+M6riVgw_+N7521d3?XQPU*o!a$$ z&g?t8>#P5N%eVJy_}{vCix@>shOCXUcCKt=A*ZN3}&vWIQ;!|nz<8);p5lEPk}j=J2$lg{d7gml|>#Iv-GIQsh|1vW0EaI{s@_ z4jb=1|M_cuZSu{x;diz@EdTNJ>|%xu&64kzn44vun`3$9;>CmcnoO(ZYZ%Yhy^47d z8{c{FQ@;GqS94ZPTAdp_EnT90#T_P2!lQV5T}zMA4w(;F)#O zD?VO3*Vrrn``_g4Pp;iJC^;|JDlK*@^ZxFlr(QXCcZqsW(=m*>9?H%qQ<2TEt}@F% zX41b0duDC=EhMO|#hK&Pq}!q6xPc|Xqe+#8g^^97jUh*=$4bxWuyTSqw<1f6NJ8d< zDmT$^l|?4cH2)somTaDR|L4Qf=X1^27}Dq0nr+L!-{-BjljZQ?!)a=hFRtJBYt^sW z#SYU#9idGy;wY+M#N ztZ~qCxWuq%8mAh=EXAcQudO_u+oaq`S-oVA)@m&S3#*Oar=DxnuTQ($q|TUd_SRM> z)<#fBdkDE9U2sZ1d?VN&Q>4ysIp%vDqE& zmHCS+K#IfUaClEcM{^XbS?}Lp(dCQFRV@`zGeM$dw-Sw)5ed^8aYHYvDHp+fJl@_wsT0DbgR%E7H zJoCP!imt-2Ge^5#X)M~t%jV!B;MCC4Ai(0t)WmV({&c6NPYp{143;nkdr7o0Dz&A$ zPuRqJ#o}+tf@*={v?*(LzJ2!kzc52n$@|&v3tqpJe|V=o{$~s0R;B5uZLO>G4)1Mj zQ%PcKW?*Yn?D)_Z!Ka-S%)lwYm>9xUx7>iq^`3sl{LEPiX%>ygw%Nu?ociVA;;WJz z$k6b3$AqQ{U(_!M->})ft0eL5Px&R>{%b4$`7*A#wIO|Hz`f<)_Wk%>AG@dMsvBz{ zV-i#GJr1V>4#ipre)4LvtWVbXWOC~Mxy>0|E!U*>vB}-~se9WB*-}m;c}2msH(*$n)#+_s8EneSV|yeca{0hn8jg zN0(n+>~*3lEp6>gr)&wIo>s%w;`F1=k2OuYxF#*&RIq*ejw!J8MEycWH3jPek@@`Z zoU^{ND=N46oMosAR(o_&Mdo_z>s<;A#yt${dHI#%EDu{PUH9yCxb2tU)84d-r+|3{odR_BXt{+hI>yR_d#6FPXjn<(pr}GPS-~2#VG2 zf65cKYSo&&vaQEA#TfdFt#UB5IU6vmFw&cW`Pj>oO9@WgKH~h{m$f>MyFgf|e zzi-=LRMbfu9nR$0vy1!XKgBQh9~kZ=A5Vx7Q<`|<$$ewaE7EeZZ)ML+ov!k1?cayb zwyK}VFthzMZ(cKdol4Ntvy2M0N1tf(X|GMQV0`$uR7kb+#u62=45cL;U-!PKV+>(T zm~mmDldJS|$9Y?s8ecnVvR>=SaaY%}|86;>*Y`sV`@H9hLR%G=GAcExN^JHypJQ+K z=T#=R|IRugheo!EDJPxY-P`M$sl!=vLro)%<>xdc&^7(*LS&X+(UMrwUSQe6L=P%mU$-39O9{W%4_oHYIpT*e=jdx9qto!LT7E=`cHQbTdvOWyTw|{xBHIi zt3;L64}K&bjg3iE&XiPib@7<#`E=n+5iN#Ueu_;7ymQK)=Vt7A`FVyx@`+o8J~Iqc zk~CA2Jbfetuhf5*Uh(fl`?5y;C!t;%9GQC7SIRPyZ6-$8M6!FFPz!r?peIDf$brSt zW!>_NlfNo#al528WdCLBN6t~=#qlkg0d>mL0rpMJBc?b#XJ+T&pLp^Dcy zQT)2RC(F@>$C*oVIE9!(ROT*NbiL`90>1`-&x`{h3>*S1MTaxD$iHAzQZ0}<)>QgD z@uKK^*ClIMq!N!ubtnbzTlM^Bl$yw<&Qo4fXTIoN0j5p49bHfh%@`#unZqlS>lPIGmIIpWbaCGGj&jg@&v0@!h8^w|&JTcw3+h_N*$o{?eI+7)so(j%17n#fz@*(Sn+T4s1$EC|01S2xf zM4QQf7Qg1`)p)Sc(B}7-_=19R@jYw0XKi6u3^4H)F>PTm@nl)EwzKoigN*!sy(bP* zZ5w%dWL5lJ7D#?5Ni^VG-!K1s#|*8IDe6aUWf{FPbs}Q=CvMbdXjX znP?s+``z};pJlUoFDtysl0SCWKKJOd>HP;grza^*a(a4aX2t!~^oKphQUWZ$zE0<1 z$vV#|Q<+%&dV;g3x4DOv;;if?r2S4@=)QdE(&e6ah4rUA)EXq+0!_M>e*NKW zC}5BvWH5{K!(?4|!xvHyx?z%LhILeY~?SiI&(!QQw8&s7=CmxqRpX?QoZuNb2+w6C7D~`AG zGd1j(B>7i*-?ZfWcXOs(U!(fezBWn8_}{J93eqn=OzzS#SsB3hqx5A6Lx@J%@l8ET zdsBaWn#H!~{~0b8ujUzw95=2#eKb$@F-LRkomK4;-%?d~{C?nnV#~CWyTA6;GAPVj zF;l#3@$T*QVJ^bYIn4L^a!s_fE3vMUk&!M}|NU#_{K*p0Jd0lJ+IZ*C@~|n3%~B71 zl-$PfYm?OWtrist{tb%CO&b$}9;r35@W{x0E_=%rbobzejSoE&Km6uf{O+3ig}-0< zziygc-L@n&*|qoJC$P+JfwCaAqx5U$)*Jbzq?TYuG&Auytx6Ksq^gnuC z$EJBttqzJ3YAs@ASjMpJo&3RI*+_|y6rH~AHob~ywEV5 z7mbtGi_Mn1`JY4EcGAZ+=YLr8M`^xrXl74yw*~x zX%+pF5}!@%{z@%WmR_|*Q(~!5gt_v8)TwejVIQWpT~cJo=)Ei1xI3CX|4!jq%lmq| zo=GOQb)U}OS+o9+&61$JM{pvP+lO{J;O+e@QcvKYz9j2LskDoH{S&kJi$}iH~@h1#ewQ{!(iD`NYgk+2tmG@3eg@*!{&^ zr(E1t{K1Kwgm=_+^a>C z+_nq5rAJP>7_(>sH^apE2Fu2_&Vr|t_!`=OFZ!}MFWKPlYxeWoA8Q_dZF%Kw>D#aO zE;;WDt}FYnZewAM;q-G%UYoCVl`J^m#oTtJ)jR#cuGFOwp@KoG8eJ`y9_GBw_rVED4Dxz;K`L< zH%mVDI(#}`s@>+8PxnJssqJz`8&}3Z2xk^L|IOh4BmL$t(;as1kW=Kl0s65`0 zlPMW?U24T9PF}+U0uFA5eNQ;NA2YHT@4J=vsB>DK#p1^kf}Di@L`0S-Jd@cOyyR57 z<@C<7ntx60|Mbpx&c60OX8OrXU;X^%&-PAt{yB4&q@Y8?A~O$;5EWmOGg_{$4-^8V z=7cY?{VR8j{c?_b&lcH*`zl-yP5toQ__N~wh~tZ6x39VTbDRB(xJ|7avqOKp_Wl0P z?9q>Btc#Mq{rZxy?Ud~Kq@rau|Kb^WB(+5RXHSTjH7QMR#nq!A-G7}|U-9DO z`x2}6xWF?!ioP58{@MAz690GZ_`L5k6leV29{0?BmEF4vi_@OZbDsVZOfz$wpds~) zQG=-_k>k4G5t-XuWs)-+-L3NXJP2f9y!Ytiw!e>$u37fVz`|dfBa|uk>8}{DpV*h=f%Llz~JfX=d#Wzp$P!V C42%W< diff --git a/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml b/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml deleted file mode 100644 index 927514dd215..00000000000 --- a/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - Pharo image file - Fichier d'image Pharo - - - - diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index 1a24ecd274e..75ce2ff771c 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.0"; name = "pharo-share-${version}"; - src = ./resources; + unpackPhase = "true"; sources10Zip = fetchurl { url = http://files.pharo.org/sources/PharoV10.sources.zip; @@ -41,8 +41,6 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $prefix/lib - cp -R "$src/"* "$prefix/" - unzip ${sources10Zip} -d $prefix/lib/ unzip ${sources20Zip} -d $prefix/lib/ unzip ${sources30Zip} -d $prefix/lib/