diff -BbprN --unified=4 boost_1_47_0/libs/filesystem/v2/src/v2_path.cpp boost_1_47_0_ticket4688/libs/filesystem/v2/src/v2_path.cpp --- boost_1_47_0/libs/filesystem/v2/src/v2_path.cpp 2011-01-11 13:39:33.000000000 -0800 +++ boost_1_47_0_ticket4688/libs/filesystem/v2/src/v2_path.cpp 2012-01-13 12:22:15.000000000 -0800 @@ -29,9 +29,9 @@ #include #include // for std::mbstate_t -#if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) +#if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || defined(__FreeBSD__) # include #endif @@ -42,9 +42,9 @@ namespace // caught. (A previous version was at namespace scope, so initialization // occurred before main(), preventing exceptions from being caught.) std::locale & loc() { -#if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__) +#if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__) && !defined(__FreeBSD__) // ISO C calls this "the locale-specific native environment": static std::locale lc(""); #else // Mac OS // "All BSD system functions expect their string parameters to be in UTF-8 encoding diff -BbprN --unified=4 boost_1_47_0/libs/filesystem/v3/src/path.cpp boost_1_47_0_ticket4688/libs/filesystem/v3/src/path.cpp --- boost_1_47_0/libs/filesystem/v3/src/path.cpp 2011-07-05 07:49:42.000000000 -0700 +++ boost_1_47_0_ticket4688/libs/filesystem/v3/src/path.cpp 2012-01-13 12:22:42.000000000 -0800 @@ -34,9 +34,9 @@ #ifdef BOOST_WINDOWS_API # include "windows_file_codecvt.hpp" # include -#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) +#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || defined(__FreeBSD__) # include #endif #ifdef BOOST_FILESYSTEM_DEBUG @@ -733,9 +733,9 @@ namespace std::locale global_loc = std::locale(); std::locale loc(global_loc, new windows_file_codecvt); return loc; -# elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) +# elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || defined(__FreeBSD__) // "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 //