1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-24 19:08:30 +00:00
nixpkgs/pkgs/development/libraries/boost/cygwin-1.57.0-filesystem-cygwin.patch

33 lines
1.6 KiB
Diff

--- 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 <windows.h>
#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \
- || defined(__FreeBSD__) || defined(__OPEN_BSD__)
+ || defined(__FreeBSD__) || defined(__OPEN_BSD__) || defined(__CYGWIN__)
# include <boost/filesystem/detail/utf8_codecvt_facet.hpp>
#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