Merge pull request #30 from thtrummer/develop

Fix warning, build error, for GCC under Cygwin
This commit is contained in:
Beman Dawes 2016-11-23 10:46:37 -05:00 committed by GitHub
commit cbefb2b9f0
2 changed files with 4 additions and 2 deletions

View File

@ -28,7 +28,9 @@
# else // BOOST_WINDOWS_API
# include <windows.h>
# include <wincrypt.h>
# pragma comment(lib, "Advapi32.lib")
# ifdef _MSC_VER
# pragma comment(lib, "Advapi32.lib")
# endif
# endif
namespace {

View File

@ -56,7 +56,7 @@ inline std::wstring convert(const char* c)
return std::wstring(s.begin(), s.end());
}
#if defined(_MSC_VER) || defined(__GXX_EXPERIMENTAL_CXX0X__)
#if defined(_MSC_VER)
// Note: these three setenv* functions are not general solutions for the missing
// setenv* problem on VC++. See Microsoft's _putenv for that need, and ticker #7018
// for discussion and rationale for returning void for this test program, which needs