Repository: thrift Updated Branches: refs/heads/master e1832c354 -> bff044667
THRIFT-4075: better support for headers-only boost with mingw Client: C++ This closes #1184 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/bff04466 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/bff04466 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/bff04466 Branch: refs/heads/master Commit: bff044667caf8a8c2b0dd30ed11b328ff2902cf5 Parents: e1832c3 Author: James E. King, III <[email protected]> Authored: Sat Feb 11 01:18:03 2017 -0500 Committer: James E. King, III <[email protected]> Committed: Sat Feb 11 01:18:03 2017 -0500 ---------------------------------------------------------------------- lib/cpp/src/thrift/windows/OverlappedSubmissionThread.h | 2 +- lib/cpp/src/thrift/windows/config.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/bff04466/lib/cpp/src/thrift/windows/OverlappedSubmissionThread.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/windows/OverlappedSubmissionThread.h b/lib/cpp/src/thrift/windows/OverlappedSubmissionThread.h index 56684bb..dd0c5c9 100644 --- a/lib/cpp/src/thrift/windows/OverlappedSubmissionThread.h +++ b/lib/cpp/src/thrift/windows/OverlappedSubmissionThread.h @@ -63,7 +63,7 @@ namespace apache { namespace thrift { namespace transport { -DECLSPEC_ALIGN(MEMORY_ALLOCATION_ALIGNMENT) struct TOverlappedWorkItem : public SLIST_ENTRY { +struct DECLSPEC_ALIGN(MEMORY_ALLOCATION_ALIGNMENT) TOverlappedWorkItem : public SLIST_ENTRY { TOverlappedWorkItem(); enum action_t { http://git-wip-us.apache.org/repos/asf/thrift/blob/bff04466/lib/cpp/src/thrift/windows/config.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/windows/config.h b/lib/cpp/src/thrift/windows/config.h index cde9de6..f54cb5e 100644 --- a/lib/cpp/src/thrift/windows/config.h +++ b/lib/cpp/src/thrift/windows/config.h @@ -28,8 +28,8 @@ #error "This is a Windows header only" #endif -// use std::thread in MSVC11 (2012) or newer -#if _MSC_VER >= 1700 +// use std::thread in MSVC11 (2012) or newer and in MinGW +#if (_MSC_VER >= 1700) || defined(__MINGW32__) #define USE_STD_THREAD 1 #else // otherwise use boost threads @@ -39,8 +39,8 @@ // Something that defines PRId64 is required to build #define HAVE_INTTYPES_H 1 -// VS2010 or later has stdint.h -#if _MSC_VER >= 1600 +// VS2010 or later has stdint.h as does MinGW +#if (_MSC_VER >= 1600) || defined(__MINGW32__) #define HAVE_STDINT_H 1 #endif
