mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 21:20:19 +00:00
a3ead9fb86
Subsurface doesn't compile on OS X any more, because libdivecomputer changed the way the header inclusion works: the include path from pkg-config no longer includes the final "libdivecomputer" component, and instead of doing #include <header.h> for libdivecomputer headers, we're now supposed to do #include <libdivecomputer/header.h> instead. Which is cleaner anyway. The reason this only bit us on OS X is that I never trusted pkg-config that much for non-system libraries on Linux (maybe it works, maybe it doesn't, I've seen it go both ways), so on Linux we just used our own version of the include path, and thus weren't affected by the libdivecomputer config change. Clean up the includes while at it - we no longer need (or want) the device-specific header files, since we just use the generic functions. Reported-by: Grischa Toedt <toedt@embl.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
24 lines
597 B
C
24 lines
597 B
C
#ifndef LIBDIVECOMPUTER_H
|
|
#define LIBDIVECOMPUTER_H
|
|
|
|
/* libdivecomputer */
|
|
#include <libdivecomputer/device.h>
|
|
#include <libdivecomputer/parser.h>
|
|
#include <libdivecomputer/utils.h>
|
|
|
|
/* handling uemis Zurich SDA files */
|
|
#include "uemis.h"
|
|
|
|
/* don't forget to include the UI toolkit specific display-XXX.h first
|
|
to get the definition of progressbar_t */
|
|
typedef struct device_data_t {
|
|
dc_descriptor_t *descriptor;
|
|
const char *vendor, *product, *devname;
|
|
dc_device_t *device;
|
|
progressbar_t progress;
|
|
int preexisting;
|
|
} device_data_t;
|
|
|
|
extern GError *do_import(device_data_t *data);
|
|
|
|
#endif
|