diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-06-22 17:41:21 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-06-22 17:41:21 -0700 |
| commit | d58de3716718207b9fe53fdd451c9d1e35bff38a (patch) | |
| tree | 7d0901e1d3d61366cad296c2440c541ea67867ff /core/libdivecomputer.h | |
| parent | 83e56cbfa6935ae6ea53911d1bee478749142c77 (diff) | |
| parent | add253ca9eee79f97de5bfd25a456102f49bef86 (diff) | |
| download | subsurface-d58de3716718207b9fe53fdd451c9d1e35bff38a.tar.gz | |
Merge branch 'master' of git://github.com/torvalds/subsurface-for-dirk
Diffstat (limited to 'core/libdivecomputer.h')
| -rw-r--r-- | core/libdivecomputer.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/libdivecomputer.h b/core/libdivecomputer.h index 19f09fdfa..a618f49f2 100644 --- a/core/libdivecomputer.h +++ b/core/libdivecomputer.h @@ -11,8 +11,8 @@ #include <libdivecomputer/version.h> #include <libdivecomputer/device.h> #include <libdivecomputer/parser.h> -#ifdef SSRF_CUSTOM_SERIAL -#include <libdivecomputer/custom_serial.h> +#ifdef SSRF_CUSTOM_IO +#include <libdivecomputer/custom_io.h> #endif #include "dive.h" @@ -56,12 +56,12 @@ extern double progress_bar_fraction; extern char *logfile_name; extern char *dumpfile_name; -#if SSRF_CUSTOM_SERIAL +#if SSRF_CUSTOM_IO // WTF. this symbol never shows up at link time -//extern dc_custom_serial_t qt_serial_ops; +//extern dc_custom_io_t qt_serial_ops; // Thats why I've worked around it with a stupid helper returning it. -dc_custom_serial_t* get_qt_serial_ops(); -extern dc_custom_serial_t serial_ftdi_ops; +dc_custom_io_t* get_qt_serial_ops(); +extern dc_custom_io_t serial_ftdi_ops; #endif #ifdef __cplusplus |