aboutsummaryrefslogtreecommitdiffstats
path: root/dive.h
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-09-12 09:47:55 -0700
committerGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-09-12 09:47:55 -0700
commitafffcdbc0d6402e3dfee421f86938b98e12fb550 (patch)
tree79eeb629b241edf558059d94e87455ee37b5c425 /dive.h
parent9cb60c910681b0fb3c04d22c77bcf9c2754bfa7f (diff)
downloadsubsurface-afffcdbc0d6402e3dfee421f86938b98e12fb550.tar.gz
Avoid using type 'gasmix_t': use 'struct gasmix' instead
libdivecomputer already uses 'gasmix_t' for its own gasmix thing. I don't like th eway we step on each others name spaces, but hey, might as well just use 'struct gasmix' and avoid the typedef. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'dive.h')
-rw-r--r--dive.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/dive.h b/dive.h
index 9e5d2c49e..d96e0102d 100644
--- a/dive.h
+++ b/dive.h
@@ -69,10 +69,10 @@ typedef struct {
int grams;
} weight_t;
-typedef struct {
+struct gasmix {
fraction_t o2;
fraction_t he;
-} gasmix_t;
+};
typedef struct {
volume_t size;
@@ -82,7 +82,7 @@ typedef struct {
typedef struct {
cylinder_type_t type;
- gasmix_t gasmix;
+ struct gasmix gasmix;
pressure_t start, end;
} cylinder_t;