summaryrefslogtreecommitdiffstats
path: root/subsurface-core
diff options
context:
space:
mode:
authorGravatar Robert C. Helling <helling@atdotde.de>2016-02-01 18:00:49 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-02-01 18:01:05 -0800
commitc32f5cc2786744ef0f2971a40bfe00b11ca3d9e1 (patch)
treebf3cce593a1b3ac250830284cc8c2baa636ee610 /subsurface-core
parentfdd5ee507c31a700ac8547efedd3b89eb9a74f85 (diff)
downloadsubsurface-c32f5cc2786744ef0f2971a40bfe00b11ca3d9e1.tar.gz
Silence compiler warnings
Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-core')
-rw-r--r--subsurface-core/divelist.c2
-rw-r--r--subsurface-core/profile.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/subsurface-core/divelist.c b/subsurface-core/divelist.c
index 7ae5e8373..400867882 100644
--- a/subsurface-core/divelist.c
+++ b/subsurface-core/divelist.c
@@ -854,7 +854,7 @@ struct dive *merge_two_dives(struct dive *a, struct dive *b)
// renumber dives from merged one in advance by difference between
// merged dives numbers. Do not renumber if actual number is zero.
- for (j; j < dive_table.nr; j++)
+ for (; j < dive_table.nr; j++)
if (!dive_table.dives[j]->number == 0)
dive_table.dives[j]->number -= factor;
diff --git a/subsurface-core/profile.h b/subsurface-core/profile.h
index 71929f8e3..abac9dd49 100644
--- a/subsurface-core/profile.h
+++ b/subsurface-core/profile.h
@@ -1,12 +1,12 @@
#ifndef PROFILE_H
#define PROFILE_H
+#include "dive.h"
+
#ifdef __cplusplus
extern "C" {
#endif
-#include "dive.h"
-
typedef enum {
STABLE,
SLOW,