mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-12 15:47:28 +00:00
77 lines
2.8 KiB
Diff
77 lines
2.8 KiB
Diff
|
--- 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 <boost/config/posix_features.hpp>
|
||
|
|
-
|
||
|
|
-//
|
||
|
|
-// 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
|