25 lines
856 B
Diff
25 lines
856 B
Diff
From 5e2489daa509dfa4994ac9b35d6e44b675654995 Mon Sep 17 00:00:00 2001
|
|
From: Ting-Wei Lan <lantw@src.gnome.org>
|
|
Date: Sun, 18 Nov 2018 14:04:12 +0800
|
|
Subject: [PATCH] iostream: Fix build with Exiv2 0.27
|
|
|
|
Exiv2 0.27 removes EXIV2_TEST_VERSION macro, so we have to compare each
|
|
part of the version number by ourselves.
|
|
---
|
|
gexiv2/gexiv2-stream-io.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/gexiv2/gexiv2-stream-io.h b/gexiv2/gexiv2-stream-io.h
|
|
index a26f4e6..7190360 100644
|
|
--- a/gexiv2/gexiv2-stream-io.h
|
|
+++ b/gexiv2/gexiv2-stream-io.h
|
|
@@ -25,7 +25,7 @@ class StreamIo : public Exiv2::BasicIo {
|
|
|
|
StreamIo (ManagedStreamCallbacks* cb);
|
|
|
|
-#if EXIV2_TEST_VERSION(0,26,0)
|
|
+#if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 26)
|
|
typedef size_t size_type;
|
|
#else
|
|
typedef long size_type;
|