]> git.tdb.fi Git - ext/subsurface.git/commitdiff
fix mingw-win32 specific warnings in libdivecomputer.c
authorDirk Hohndel <dirk@hohndel.org>
Sun, 27 Nov 2011 17:10:37 +0000 (09:10 -0800)
committerDirk Hohndel <dirk@hohndel.org>
Sun, 27 Nov 2011 17:10:37 +0000 (09:10 -0800)
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>
libdivecomputer.c

index b1c86c5ee8d378ad1852a88e7d396d88885b78a1..9d4c1065a3817ce046798448b7c7a39a2a10be2a 100644 (file)
@@ -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;