diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2015-08-31 21:45:31 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-08-31 18:43:43 -0700 |
| commit | 1ef20ee5d8b13a5413ec5aabf16aaa1f1bdd65fd (patch) | |
| tree | a3606c0fec918f5e1c51bf4c2f0b7ba2c3f0dfe0 /divesite.h | |
| parent | e36e4d1faa95439a1806935de6dcbd04d2283d20 (diff) | |
| download | subsurface-1ef20ee5d8b13a5413ec5aabf16aaa1f1bdd65fd.tar.gz | |
Merge the dive sites selected.
Wee. :)
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'divesite.h')
| -rw-r--r-- | divesite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/divesite.h b/divesite.h index 154788460..345b50448 100644 --- a/divesite.h +++ b/divesite.h @@ -66,7 +66,7 @@ void copy_dive_site(struct dive_site *orig, struct dive_site *copy); void clear_dive_site(struct dive_site *ds); unsigned int get_distance(degrees_t lat1, degrees_t lon1, degrees_t lat2, degrees_t lon2); uint32_t find_or_create_dive_site_with_name(const char *name, timestamp_t divetime); -void merge_dive_sites(uint32_t *uuids, int count); +void merge_dive_sites(uint32_t ref, uint32_t *uuids, int count); #define INVALID_DIVE_SITE_NAME "development use only - not a valid dive site name" |