summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Rick Walsh <rickmwalsh@gmail.com>2016-04-18 05:58:54 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-04-18 06:01:01 -0700
commit62b989979e0fd9e90f7329a077f9ed6dadb798e9 (patch)
treeb16c11f0c7315c093b3afd11c5aae6a54e43e827
parent628f83d5cf8a5ebaf04925709520e821042b2a6c (diff)
downloadsubsurface-62b989979e0fd9e90f7329a077f9ed6dadb798e9.tar.gz
Fix broken Bluetooth support
This partially reverts Commit 39313c5 Reported-and-analyzed-by: Rick Walsh <rickmwalsh@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--core/configuredivecomputerthreads.cpp1
-rw-r--r--core/libdivecomputer.h2
2 files changed, 0 insertions, 3 deletions
diff --git a/core/configuredivecomputerthreads.cpp b/core/configuredivecomputerthreads.cpp
index b229fc808..c86c0966c 100644
--- a/core/configuredivecomputerthreads.cpp
+++ b/core/configuredivecomputerthreads.cpp
@@ -1,7 +1,6 @@
#include "configuredivecomputerthreads.h"
#include "libdivecomputer/hw.h"
#include "libdivecomputer.h"
-#include <libdivecomputer/version.h>
#define OSTC3_GAS1 0x10
#define OSTC3_GAS2 0x11
diff --git a/core/libdivecomputer.h b/core/libdivecomputer.h
index 99f1c2490..f52f6959a 100644
--- a/core/libdivecomputer.h
+++ b/core/libdivecomputer.h
@@ -7,9 +7,7 @@
#ifdef DC_VERSION /* prevent a warning with wingdi.h */
#undef DC_VERSION
#endif
-#ifdef HAVE_LIBDIVECOMPUTER
#include <libdivecomputer/version.h>
-#endif
#include <libdivecomputer/device.h>
#include <libdivecomputer/parser.h>