diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-06 10:57:16 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-10-06 10:57:16 -0700 |
| commit | b3490213f42ed63bc4b05b37bcfc12809f2d432c (patch) | |
| tree | d56ede6f1ea8d20c2120eba2b9ca705927a77913 /libdivecomputer.h | |
| parent | 92d8978ab4ad980397883b50d0e7bc81d2bf5f73 (diff) | |
| parent | 70352c3962cf3b4379590326cdc489ac0543f7e9 (diff) | |
| download | subsurface-b3490213f42ed63bc4b05b37bcfc12809f2d432c.tar.gz | |
Merge branch 'glib-removal-hack'
Fix obvious merge issue in Rules.mk
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'libdivecomputer.h')
| -rw-r--r-- | libdivecomputer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libdivecomputer.h b/libdivecomputer.h index 07d965ef6..39fd80909 100644 --- a/libdivecomputer.h +++ b/libdivecomputer.h @@ -24,11 +24,11 @@ typedef struct device_data_t { dc_device_t *device; dc_context_t *context; int preexisting; - gboolean force_download; + bool force_download; } device_data_t; const char *do_libdivecomputer_import(device_data_t *data); -char *do_uemis_import(const char *mountpath, short force_download); +const char *do_uemis_import(const char *mountpath, short force_download); extern int import_thread_cancelled; extern const char *progress_bar_text; |