yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a -Wformat warning on FreeBSD

Browse source 
On FreeBSD we get a long long result so %ld triggers a warning. Cast to
long long and use %lld to make it work on all platforms (including 32-bit).
This commit is contained in:
Alex Richardson 2021-10-06 20:49:21 +01:00 committed by Alex Richardson
parent 8ab41804f0
commit 722f092b7a
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/renderloop.cpp
View file

@ -127,8 +127,10 @@ void RenderLoopPrivate::notifyFrameCompleted(std::chrono::nanoseconds timestamp)
if (lastPresentationTimestamp <= timestamp) { if (lastPresentationTimestamp <= timestamp) {
lastPresentationTimestamp = timestamp; lastPresentationTimestamp = timestamp;
} else { } else {
qCWarning(KWIN_CORE, "Got invalid presentation timestamp: %ld (current %ld)", qCWarning(KWIN_CORE,
timestamp.count(), lastPresentationTimestamp.count()); "Got invalid presentation timestamp: %lld (current %lld)",
static_cast<long long>(timestamp.count()),
static_cast<long long>(lastPresentationTimestamp.count()));
lastPresentationTimestamp = std::chrono::steady_clock::now().time_since_epoch(); lastPresentationTimestamp = std::chrono::steady_clock::now().time_since_epoch();
} }

6
src/scene.cpp
View file

@ -176,8 +176,10 @@ void Scene::paintScreen(const QRegion &damage, const QRegion &repaint,
std::chrono::duration_cast<std::chrono::milliseconds>(renderLoop->nextPresentationTimestamp()); std::chrono::duration_cast<std::chrono::milliseconds>(renderLoop->nextPresentationTimestamp());
if (Q_UNLIKELY(presentTime < m_expectedPresentTimestamp)) { if (Q_UNLIKELY(presentTime < m_expectedPresentTimestamp)) {
qCDebug(KWIN_CORE, "Provided presentation timestamp is invalid: %ld (current: %ld)", qCDebug(KWIN_CORE,
presentTime.count(), m_expectedPresentTimestamp.count()); "Provided presentation timestamp is invalid: %lld (current: %lld)",
static_cast<long long>(presentTime.count()),
static_cast<long long>(m_expectedPresentTimestamp.count()));
} else { } else {
m_expectedPresentTimestamp = presentTime; m_expectedPresentTimestamp = presentTime;
} }