From 6ced15e1a4e7ba3dcd07edebc192420c237900d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Sat, 28 Nov 2020 19:27:29 +0100 Subject: [PATCH] Allow compilation with libgit2 versions with >= minor version number The major version must still be an exact match since libgit2 uses semantic versioning and changes to the major number indicate backwards incompatible changes to the API. Fixes #695 --- git_bundled_static.go | 4 ++-- git_system_dynamic.go | 4 ++-- git_system_static.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/git_bundled_static.go b/git_bundled_static.go index 48d9be5..4d10d45 100644 --- a/git_bundled_static.go +++ b/git_bundled_static.go @@ -9,8 +9,8 @@ package git #cgo CFLAGS: -DLIBGIT2_STATIC #include -#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 1 -# error "Invalid libgit2 version; this git2go supports libgit2 v1.1" +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 1 || LIBGIT2_VER_MINOR > 1 +# error "Invalid libgit2 version; this git2go supports libgit2 between v1.1.0 and v1.1.0" #endif */ import "C" diff --git a/git_system_dynamic.go b/git_system_dynamic.go index 571a77f..3013804 100644 --- a/git_system_dynamic.go +++ b/git_system_dynamic.go @@ -7,8 +7,8 @@ package git #cgo CFLAGS: -DLIBGIT2_DYNAMIC #include -#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 1 -# error "Invalid libgit2 version; this git2go supports libgit2 v1.1" +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 1 || LIBGIT2_VER_MINOR > 1 +# error "Invalid libgit2 version; this git2go supports libgit2 between v1.1.0 and v1.1.0" #endif */ import "C" diff --git a/git_system_static.go b/git_system_static.go index 3049763..f3da651 100644 --- a/git_system_static.go +++ b/git_system_static.go @@ -7,8 +7,8 @@ package git #cgo CFLAGS: -DLIBGIT2_STATIC #include -#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 1 -# error "Invalid libgit2 version; this git2go supports libgit2 v1.1" +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 1 || LIBGIT2_VER_MINOR > 1 +# error "Invalid libgit2 version; this git2go supports libgit2 between v1.1.0 and v1.1.0" #endif */ import "C"