kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

port to MSYS2/clang

Browse Source
This commit is contained in:
wmayer
2021-09-19 19:49:44 +02:00
parent ef0e303235
commit e211b89cf8
29 changed files with 82 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Base/Sequencer.cpp
View File

@@ -41,7 +41,11 @@ namespace Base {
// members
static std::vector<SequencerBase*> _instances; /**< A vector of all created instances */
static SequencerLauncher* _topLauncher; /**< The outermost launcher */
#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
static QRecursiveMutex mutex; /**< A mutex-locker for the launcher */
#else
static QMutex mutex; /**< A mutex-locker for the launcher */
#endif
/** Sets a global sequencer object.
* Access to the last registered object is performed by @see Sequencer().
*/
@@ -67,7 +71,11 @@ namespace Base {
*/
std::vector<SequencerBase*> SequencerP::_instances;
SequencerLauncher* SequencerP::_topLauncher = 0;
#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
QRecursiveMutex SequencerP::mutex;
#else
QMutex SequencerP::mutex(QMutex::Recursive);
#endif
}
SequencerBase& SequencerBase::Instance ()

4
src/Base/TimeInfo.cpp
View File

@@ -26,7 +26,7 @@
#ifndef _PreComp_
# include <sstream>
# include <QDateTime>
# if defined(FC_OS_LINUX)
# if defined(FC_OS_LINUX) || defined(__MINGW32__)
# include <sys/time.h>
# endif
#endif
@@ -60,7 +60,7 @@ TimeInfo::~TimeInfo()
void TimeInfo::setCurrent(void)
{
#if defined (FC_OS_BSD) || defined(FC_OS_LINUX)
#if defined (FC_OS_BSD) || defined(FC_OS_LINUX) || defined(__MINGW32__)
struct timeval t;
gettimeofday(&t, NULL);
timebuffer.time = t.tv_sec;