diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2011-11-27 09:10:37 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2011-11-27 09:10:37 -0800 |
| commit | ff0209a5b42ced7d8b9ef9c5d84cbc5a4d84a0ac (patch) | |
| tree | b7a8f6f57351a641e49f86dd2db795ee12ce20a9 /libdivecomputer.c | |
| parent | 9b9355c770f39af6e140432645ca9f4b134cd1f2 (diff) | |
| download | subsurface-ff0209a5b42ced7d8b9ef9c5d84cbc5a4d84a0ac.tar.gz | |
fix mingw-win32 specific warnings in libdivecomputer.c
1) since %lld is not defined in the MSVC runtime, use
the portable PRId64 macro from inttypes.h for 64bit integers
notice in inttypes.h from mingw-win32:
/* 7.8.1 Macros for format specifiers
*
* MS runtime does not yet understand C9x standard "ll"
* length specifier. It appears to treat "ll" as "l".
* The non-standard I64 length specifier causes warning in GCC,
* but understood by MS runtime functions.
*/
2) include unistd.h to disable warning:
warning: implicit declaration of function 'usleep'
Lubomir's code then caused a warning building natively under Linux, which
I fixed as well.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Diffstat (limited to 'libdivecomputer.c')
| -rw-r--r-- | libdivecomputer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libdivecomputer.c b/libdivecomputer.c index b1c86c5ee..9d4c1065a 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -1,5 +1,7 @@ #include <stdio.h> #include <pthread.h> +#include <unistd.h> +#include <inttypes.h> #include "dive.h" #include "divelist.h" @@ -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; |