summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-06-27 20:52:12 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-06-27 20:52:12 -0700
commitfbdba88dece31e6a84f4992d4f8a4909982a699c (patch)
tree02d85041f0673fc5ed4d9e62b671494715237e5c
parent526595644fbef79aba53bc96f5e1507a13294805 (diff)
downloadsubsurface-fbdba88dece31e6a84f4992d4f8a4909982a699c.tar.gz
Update Subsurface-branch of libdivecomputer check
We now require the Subsurface-branch, and at least version 2 of the Subsurface API of libdivecomputer. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--core/libdivecomputer.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/core/libdivecomputer.c b/core/libdivecomputer.c
index 7d41b9d06..388bb33c0 100644
--- a/core/libdivecomputer.c
+++ b/core/libdivecomputer.c
@@ -17,15 +17,10 @@
#include <libdivecomputer/version.h>
#include "libdivecomputer.h"
-#if !defined(SSRF_LIBDC_VERSION)
-#pragma message "You are not compiling against the Subsurface branch of libdivecomputer"
-#pragma message "While this may still work, you are missing important features of Subsurface"
+#if !defined(SSRF_LIBDC_VERSION) || SSRF_LIBDC_VERSION < 2
+#pragma message "Subsurface requires a reasonably current version of the Subsurface-branch"
+#pragma message "of libdivecomputer (at least version 2 of our API)."
#pragma message "Please get it from http://github.com/Subsurface-divelog/libdc Subsurface-branch"
-#else
-#if !defined(SSRF_CUSTOM_IO)
-#pragma message "You are compiling against an older version of the Subsurface branch of libdivecomputer"
-#pragma message "which doesn't support the new SSRF_CUSTOM_IO model. Please update libdc"
-#endif
#endif
//
// If we have an old libdivecomputer, it doesn't