make it build with libgit 1.8.2

fixes horizon-eda#788
frmdstryr · Oct 20, 2024 · 3b6b783 · 3b6b783
1 parent 1ef4704
commit 3b6b783
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/pool-prj-mgr/pool-mgr/pool_git_box.cpp b/src/pool-prj-mgr/pool-mgr/pool_git_box.cpp
@@ -631,7 +631,7 @@ void PoolGitBox::handle_pr()
             git_signature_default(&signature.ptr, repo);
 
             git_oid new_commit_oid;
-#if (LIBGIT2_VER_MAJOR == 1) && (LIBGIT2_VER_MINOR == 8)
+#if (LIBGIT2_VER_MAJOR == 1) && (LIBGIT2_VER_MINOR == 8) && (LIBGIT2_VER_REVISION < 2)
             std::array<git_commit *, 2> parents;
 #else
             std::array<const git_commit *, 2> parents;

diff --git a/src/pool-prj-mgr/pool-mgr/pool_remote_box.cpp b/src/pool-prj-mgr/pool-mgr/pool_remote_box.cpp
@@ -1137,7 +1137,7 @@ void PoolRemoteBox::create_pr_thread()
 
             autofree_ptr<git_commit> parent_commit(git_commit_free);
             git_commit_lookup(&parent_commit.ptr, repo, &parent_oid);
-#if (LIBGIT2_VER_MAJOR == 1) && (LIBGIT2_VER_MINOR == 8)
+#if (LIBGIT2_VER_MAJOR == 1) && (LIBGIT2_VER_MINOR == 8) && (LIBGIT2_VER_REVISION < 2)
             git_commit *parent_commit_p = parent_commit.ptr;
 #else
             const git_commit *parent_commit_p = parent_commit.ptr;
@@ -1287,7 +1287,7 @@ void PoolRemoteBox::update_pr_thread()
                 throw std::runtime_error("error getting default signature");
             }
 
-#if (LIBGIT2_VER_MAJOR == 1) && (LIBGIT2_VER_MINOR == 8)
+#if (LIBGIT2_VER_MAJOR == 1) && (LIBGIT2_VER_MINOR == 8) && (LIBGIT2_VER_REVISION < 2)
             git_commit *parent_commit_p = latest_commit.ptr;
 #else
             const git_commit *parent_commit_p = latest_commit.ptr;