mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
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>
This commit is contained in:
parent
9cb60c9106
commit
afffcdbc0d
3 changed files with 5 additions and 5 deletions
2
dive.c
2
dive.c
|
|
@ -246,7 +246,7 @@ static void merge_cylinder_type(cylinder_type_t *res, cylinder_type_t *a, cylind
|
|||
*res = *b;
|
||||
}
|
||||
|
||||
static void merge_cylinder_mix(gasmix_t *res, gasmix_t *a, gasmix_t *b)
|
||||
static void merge_cylinder_mix(struct gasmix *res, struct gasmix *a, struct gasmix *b)
|
||||
{
|
||||
if (a->o2.permille)
|
||||
b = a;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue