Merge branch 'glib-removal-hack'

Fix obvious merge issue in Rules.mk

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/deco.c b/deco.c
index c7ad61660..788c258fe 100644
--- a/deco.c
+++ b/deco.c
@@ -249,7 +249,7 @@ double restore_deco_state(char *data)
 	return tissue_tolerance;
 }
 
-unsigned int deco_allowed_depth(double tissues_tolerance, double surface_pressure, struct dive *dive, gboolean smooth)
+unsigned int deco_allowed_depth(double tissues_tolerance, double surface_pressure, struct dive *dive, bool smooth)
 {
 	unsigned int depth;
 	double pressure_delta;