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 /planner.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 'planner.h')
| -rw-r--r-- | planner.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -6,7 +6,6 @@ extern "C" { #endif -extern void plan(struct diveplan *diveplan, char **cache_datap, struct dive **divep, bool add_plan, char **error_string_p); extern int validate_gas(const char *text, int *o2_p, int *he_p); extern int validate_time(const char *text, int *sec_p, int *rel_p); extern int validate_depth(const char *text, int *mm_p); @@ -14,9 +13,9 @@ extern int validate_po2(const char *text, int *mbar_po2); extern int validate_volume(const char *text, int *sac); extern timestamp_t current_time_notz(void); extern void show_planned_dive(char **error_string_p); -extern int add_duration_to_nth_dp(struct diveplan *diveplan, int idx, int duration, gboolean is_rel); +extern int add_duration_to_nth_dp(struct diveplan *diveplan, int idx, int duration, bool is_rel); extern void add_po2_to_nth_dp(struct diveplan *diveplan, int idx, int po2); -extern void set_last_stop(gboolean last_stop_6m); +extern void set_last_stop(bool last_stop_6m); extern struct diveplan diveplan; extern struct dive *planned_dive; |