From 2c5283eb78f50c39a01f8d6937105ba19ab3c528 Mon Sep 17 00:00:00 2001 From: Jinhao Date: Tue, 10 Mar 2015 13:30:15 +0800 Subject: [PATCH] fix mingw compiling errors Manually merge the commit which is created by Pr0curo --- source/basic_types.cpp | 2 ++ source/gui/notifier.cpp | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/source/basic_types.cpp b/source/basic_types.cpp index b49dc0bb..629ab81b 100644 --- a/source/basic_types.cpp +++ b/source/basic_types.cpp @@ -18,6 +18,8 @@ #endif #include +#include + namespace nana { //class color diff --git a/source/gui/notifier.cpp b/source/gui/notifier.cpp index c0567bc5..9ccc3dd4 100644 --- a/source/gui/notifier.cpp +++ b/source/gui/notifier.cpp @@ -1,7 +1,7 @@ /* * Implementation of Notifier * Nana C++ Library(http://www.nanapro.org) -* Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com) +* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com) * * Distributed under the Boost Software License, Version 1.0. * (See accompanying file LICENSE_1_0.txt or copy at @@ -16,7 +16,12 @@ #include #include + +#if defined(NANA_MINGW) && defined(STD_THREAD_NOT_SUPPORTED) +#include +#else #include +#endif #if defined(NANA_WINDOWS) #include