fixup: Fix compile with gcc 4.9.3

popcornmix · Sep 7, 2018 · b746d45 · b746d45
1 parent 6c4d6d6
commit b746d45
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp
@@ -2346,7 +2346,7 @@ bool CMusicDatabase::GetSongByFileName(const std::string& strFileNameAndPath, CS
                                  "where strFileName='%s' and strPath='%s'",
                                  strFileName.c_str(), strPath.c_str());
   if (startOffset)
-    strSQL += PrepareSQL(" AND iStartOffset=%" PRIi64, startOffset);
+    strSQL += PrepareSQL(" AND iStartOffset=%" PRId64, startOffset);
 
   int idSong = (int)strtol(GetSingleValue(strSQL).c_str(), NULL, 10);
   if (idSong > 0)

diff --git a/xbmc/playlists/PlayListM3U.cpp b/xbmc/playlists/PlayListM3U.cpp
@@ -230,7 +230,7 @@ void CPlayListM3U::Save(const std::string& strFileName) const
       return; // error
     if (item->m_lStartOffset != 0 || item->m_lEndOffset != 0)
     {
-      strLine = StringUtils::Format("%s:%" PRIi64 ",%" PRIi64 "\n", OffsetMarker, item->m_lStartOffset, item->m_lEndOffset);
+      strLine = StringUtils::Format("%s:%" PRId64 ",%" PRId64 "\n", OffsetMarker, item->m_lStartOffset, item->m_lEndOffset);
       file.Write(strLine.c_str(),strLine.size());
     }
     std::string strFileName = ResolveURL(item);

diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
@@ -1333,7 +1333,7 @@ void CWinSystemWayland::PrepareFramePresentation()
       }
       m_latencyMovingAverage = m_latencyMovingAverage + iter->latency / LATENCY_MOVING_AVERAGE_SIZE + adjust;
 
-      CLog::Log(LOGDEBUG, LOGAVTIMING, "Presentation feedback: %" PRIi64 " ns -> moving average %f s", latency, static_cast<double> (m_latencyMovingAverage));
+      CLog::Log(LOGDEBUG, LOGAVTIMING, "Presentation feedback: %" PRId64 " ns -> moving average %f s", latency, static_cast<double> (m_latencyMovingAverage));
     };
     feedback.on_discarded() = [this,iter]()
     {

diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp
@@ -1348,7 +1348,7 @@ void CGUIMediaWindow::GetDirectoryHistoryString(const CFileItem* pItem, std::str
   {
     // Could be a cue item, all items of a cue share the same filename
     // so add the offsets to build the history string
-    strHistoryString = StringUtils::Format("%" PRIi64 "%" PRIi64,
+    strHistoryString = StringUtils::Format("%" PRId64 "%" PRId64,
                                            pItem->m_lStartOffset,
                                            pItem->m_lEndOffset);
     strHistoryString += pItem->GetPath();