diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch b/nixpkgs/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch new file mode 100644 index 000000000000..35e6905b0f33 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/boost/cygwin-1.57.0-smart_ptr-cygwin.patch @@ -0,0 +1,77 @@ +--- 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 <boost/smart_ptr/detail/atomic_count_sync.hpp> + +-#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) ++#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) + # include <boost/smart_ptr/detail/atomic_count_win32.hpp> + + #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 <boost/smart_ptr/detail/lwm_nop.hpp> + #elif defined(BOOST_HAS_PTHREADS) + # include <boost/smart_ptr/detail/lwm_pthreads.hpp> +-#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 <boost/smart_ptr/detail/lwm_win32_cs.hpp> + #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 <boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp> + +-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined(__CYGWIN__) ++#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) + # include <boost/smart_ptr/detail/sp_counted_base_w32.hpp> + + #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 <boost/smart_ptr/detail/spinlock_sync.hpp> + +-#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) ++#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) + # include <boost/smart_ptr/detail/spinlock_w32.hpp> + + #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 <windows.h> +--- 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 <boost/smart_ptr/detail/sp_interlocked.hpp> + #include <boost/detail/lightweight_test.hpp> |