Use POSIX API on Cygwin.

Author: Lastique

build/Jamfile.v2

@@ -39,7 +39,7 @@ rule select-windows-crypto-api ( properties * )
 {
     local result ;
 
-    if <target-os>windows in $(properties) || <target-os>cygwin in $(properties)
+    if <target-os>windows in $(properties)
     {
         if ! [ has-config-flag BOOST_FILESYSTEM_DISABLE_BCRYPT : $(properties) ] &&
             [ configure.builds ../config//has_bcrypt : $(properties) : "has BCrypt API" ]
@@ -175,10 +175,6 @@ project
       <target-os>windows:<define>_WIN32_WINNT=0x0A00
       <target-os>windows:<define>WIN32_LEAN_AND_MEAN
       <target-os>windows:<define>NOMINMAX
-      <target-os>cygwin:<define>BOOST_USE_WINDOWS_H
-      <target-os>cygwin:<define>_WIN32_WINNT=0x0A00
-      <target-os>cygwin:<define>WIN32_LEAN_AND_MEAN
-      <target-os>cygwin:<define>NOMINMAX
 
       # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105329
       # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105651
@@ -207,7 +203,7 @@ rule select-platform-specific-sources ( properties * )
 {
     local result ;
 
-    if <target-os>windows in $(properties) || <target-os>cygwin in $(properties)
+    if <target-os>windows in $(properties)
     {
         result += <source>windows_file_codecvt.cpp ;
     }

include/boost/filesystem/config.hpp

@@ -59,8 +59,7 @@
 #error BOOST_FILESYSTEM_WINDOWS_API and BOOST_FILESYSTEM_POSIX_API must not be defined by users
 #endif
 
-// Cygwin is treated as Windows to minimize path character code conversions
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__CYGWIN__)
+#if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && !defined(__CYGWIN__)
 #define BOOST_FILESYSTEM_WINDOWS_API
 #else
 #define BOOST_FILESYSTEM_POSIX_API

src/platform_config.hpp

@@ -68,10 +68,11 @@
 #define _INCLUDE_STDCSOURCE_199901
 #endif
 
-#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(__TOS_WIN__) || defined(__WINDOWS__) || \
-    defined(__CYGWIN__)
+#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(__TOS_WIN__) || defined(__WINDOWS__)
 // Define target Windows version macros before including any other headers
 #include <boost/winapi/config.hpp>
+#elif defined(__CYGWIN__)
+#define _POSIX_C_SOURCE 200809
 #endif
 
 #ifndef BOOST_SYSTEM_NO_DEPRECATED

test/Jamfile.v2

@@ -49,6 +49,7 @@ rule check-mklink ( properties * )
 project
     : requirements
       <include>.
+      <include>../src
       <target-os>windows:<define>_SCL_SECURE_NO_WARNINGS
       <target-os>windows:<define>_SCL_SECURE_NO_DEPRECATE
       <target-os>windows:<define>_CRT_SECURE_NO_WARNINGS

test/deprecated_test.cpp

@@ -78,7 +78,7 @@ int cpp_main(int /*argc*/, char* /*argv*/[])
     // The choice of platform is make at runtime rather than compile-time
     // so that compile errors for all platforms will be detected even though
     // only the current platform is runtime tested.
-    platform = (platform == "Win32" || platform == "Win64" || platform == "Cygwin") ? "Windows" : "POSIX";
+    platform = (platform == "Win32" || platform == "Win64") ? "Windows" : "POSIX";
     std::cout << "Platform is " << platform << '\n';
 
     l.push_back('s');

test/operations_test.cpp

@@ -7,6 +7,8 @@
 
 //  Library home page: http://www.boost.org/libs/filesystem
 
+#include "platform_config.hpp"
+
 #include <boost/config/warning_disable.hpp>
 
 //  See deprecated_test for tests of deprecated features
@@ -729,10 +731,13 @@ void recursive_directory_iterator_tests()
          it != fs::recursive_directory_iterator();
          it.increment(ec))
     {
+        std::cout << "  iterator path: " << it->path().string() << std::endl;
         if (it->path().filename() == "d1f1")
             ++d1f1_count;
         BOOST_TEST(it == it2); // verify single pass shallow copy semantics
     }
+    if (ec)
+        cout << "  iterator increment returned error: " << ec << ", " << ec.message() << endl;
     BOOST_TEST(!ec);
     BOOST_TEST_EQ(d1f1_count, 1);
     BOOST_TEST(it == it2); // verify single pass shallow copy semantics

test/path_test.cpp

@@ -2936,7 +2936,7 @@ int cpp_main(int, char*[])
     // The choice of platform is make at runtime rather than compile-time
     // so that compile errors for all platforms will be detected even though
     // only the current platform is runtime tested.
-    platform = (platform == "Win32" || platform == "Win64" || platform == "Cygwin") ? "Windows" : "POSIX";
+    platform = (platform == "Win32" || platform == "Win64") ? "Windows" : "POSIX";
     std::cout << "Platform is " << platform << '\n';
 
     BOOST_TEST(p1.string() != p3.string());