summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-07-17 16:50:03 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-07-17 16:50:03 -0700
commit2f84a85dc99424d08a27460edaa8b41faa3c3aab (patch)
treef7ed3ffdd96621f22dd48ad596aa1134984dc7c9
parent071e3f993348ba1eb9f224c7fd40aec921322189 (diff)
downloadsubsurface-2f84a85dc99424d08a27460edaa8b41faa3c3aab.tar.gz
Resolve type confusion
No idea why this now shows up as an error in the iOS build. We need to refer to the typedef, not the underlying struct. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--core/libdivecomputer.c2
-rw-r--r--core/uemis-downloader.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/libdivecomputer.c b/core/libdivecomputer.c
index 9fbac0459..57264aa83 100644
--- a/core/libdivecomputer.c
+++ b/core/libdivecomputer.c
@@ -603,7 +603,7 @@ static void parse_string_field(struct dive *dive, dc_field_string_t *str)
}
#endif
-static dc_status_t libdc_header_parser(dc_parser_t *parser, dc_user_device_t *devdata, struct dive *dive)
+static dc_status_t libdc_header_parser(dc_parser_t *parser, device_data_t *devdata, struct dive *dive)
{
dc_status_t rc = 0;
dc_datetime_t dt = { 0 };
diff --git a/core/uemis-downloader.c b/core/uemis-downloader.c
index 7c91f985a..023ac8eaa 100644
--- a/core/uemis-downloader.c
+++ b/core/uemis-downloader.c
@@ -1120,7 +1120,7 @@ static void get_uemis_divespot(const char *mountpath, int divespot_id, struct di
}
}
-static bool get_matching_dive(int idx, char *newmax, int *uemis_mem_status, dc_user_device_t *data, const char *mountpath, const char deviceidnr)
+static bool get_matching_dive(int idx, char *newmax, int *uemis_mem_status, device_data_t *data, const char *mountpath, const char deviceidnr)
{
struct dive *dive = data->download_table->dives[idx];
char log_file_no_to_find[20];