From 6f233cbff5e8b69f3a33b1547f5ca78af7e5499f Mon Sep 17 00:00:00 2001
From: Leland Lucius <github@homerow.net>
Date: Mon, 13 Jul 2020 09:48:37 -0500
Subject: [PATCH] AUP3: Fix build issues

---
 src/ProjectFileIO.cpp | 9 +++++----
 src/ProjectFileIO.h   | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/ProjectFileIO.cpp b/src/ProjectFileIO.cpp
index 5ce555e83..345788811 100644
--- a/src/ProjectFileIO.cpp
+++ b/src/ProjectFileIO.cpp
@@ -23,6 +23,7 @@ Paul Licameli split from AudacityProject.cpp
 #include "ProjectSerializer.h"
 #include "ProjectSettings.h"
 #include "SampleBlock.h"
+#include "Sequence.h"
 #include "Tags.h"
 #include "ViewInfo.h"
 #include "WaveClip.h"
@@ -727,7 +728,7 @@ bool ProjectFileIO::CheckForOrphans(BlockIDs &blockids)
 }
 
 /* static */
-void ProjectFileIO::UpdateCallback(void *data, int operation, char const *dbname, char const *table, int64_t rowid)
+void ProjectFileIO::UpdateCallback(void *data, int operation, char const *dbname, char const *table, long long rowid)
 {
    UpdateCB cb = *static_cast<UpdateCB *>(data);
    cb(operation, dbname, table, rowid);
@@ -822,10 +823,10 @@ sqlite3 *ProjectFileIO::CopyTo(const FilePath &destpath, bool prune /* = false *
          in doing something.*/
       ProgressDialog progress(XO("Progress"), XO("Saving project"));
 
-      int64_t count = 0;
-      int64_t total = blockids.size();
+      wxLongLong_t count = 0;
+      wxLongLong_t total = blockids.size();
 
-      UpdateCB update = [&](int operation, char const *dbname, char const *table, int64_t rowid)
+      UpdateCB update = [&](int operation, char const *dbname, char const *table, long long rowid)
       {
          count++;
       };
diff --git a/src/ProjectFileIO.h b/src/ProjectFileIO.h
index 556408c75..830076e28 100644
--- a/src/ProjectFileIO.h
+++ b/src/ProjectFileIO.h
@@ -170,8 +170,8 @@ private:
    void SetError(const TranslatableString & msg);
    void SetDBError(const TranslatableString & msg);
 
-   using UpdateCB = std::function<void(int operation, char const *dbname, char const *table, int64_t rowid)>;
-   static void UpdateCallback(void *data, int operation, char const *dbname, char const *table, int64_t rowid);
+   using UpdateCB = std::function<void(int operation, char const *dbname, char const *table, long long rowid)>;
+   static void UpdateCallback(void *data, int operation, char const *dbname, char const *table, long long rowid);
 
 private:
    // non-static data members