X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=libdivecomputer.c;h=9d4c1065a3817ce046798448b7c7a39a2a10be2a;hb=001f6d05dca762de232c68b7ff10fdc999a61514;hp=bcf59eeb588ba463de2de58d3e2af719f00ab8f0;hpb=d6c2236b8a9e20d22d78de7432f7017a18235619;p=ext%2Fsubsurface.git diff --git a/libdivecomputer.c b/libdivecomputer.c index bcf59ee..9d4c106 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -1,5 +1,7 @@ #include #include +#include +#include #include "dive.h" #include "divelist.h" @@ -411,10 +413,10 @@ static device_status_t device_open(const char *devname, static void event_cb(device_t *device, device_event_t event, const void *data, void *userdata) { - const device_progress_t *progress = (device_progress_t *) data; - const device_devinfo_t *devinfo = (device_devinfo_t *) data; - const device_clock_t *clock = (device_clock_t *) data; - device_data_t *devdata = (device_data_t *) userdata; + const device_progress_t *progress = data; + const device_devinfo_t *devinfo = data; + const device_clock_t *clock = data; + device_data_t *devdata = userdata; switch (event) { case DEVICE_EVENT_WAITING: @@ -433,8 +435,8 @@ static void event_cb(device_t *device, device_event_t event, const void *data, v break; case DEVICE_EVENT_CLOCK: devdata->clock = *clock; - printf("Event: systime=%lld, devtime=%u\n", - clock->systime, clock->devtime); + printf("Event: systime=%"PRId64", devtime=%u\n", + (uint64_t)clock->systime, clock->devtime); break; default: break;