fix compiler warning in cmdhflegic.c (and whitespace fixes) (#826)

[proxmark3-svn] / client / util_posix.c

diff --git a/client/util_posix.c b/client/util_posix.c
index 8f3ed46b6a45c827950dfb377745965ade89e3c7..435e41f39cebdb8b5eea32ac81b16a6358113254 100644 (file)
--- a/client/util_posix.c
+++ b/client/util_posix.c
@@ -37,8 +37,12 @@ void msleep(uint32_t n) {
 
 #ifdef __APPLE__
 
 
 #ifdef __APPLE__
 

+#ifndef CLOCK_MONOTONIC

        #define CLOCK_MONOTONIC (1)
        #define CLOCK_MONOTONIC (1)

+#endif
+#ifndef CLOCK_REALTIME

        #define CLOCK_REALTIME (2)
        #define CLOCK_REALTIME (2)

+#endif

 
        #include <sys/time.h>
        #include <mach/clock.h>
 
        #include <sys/time.h>
        #include <mach/clock.h>


@@ -113,7 +117,7 @@ uint64_t msclock() {
        #include <sys/timeb.h>
        struct _timeb t;
        _ftime(&t);
        #include <sys/timeb.h>
        struct _timeb t;
        _ftime(&t);

-       return 1000 * t.time + t.millitm;
+       return 1000 * (uint64_t)t.time + t.millitm;

 
 // NORMAL CODE (use _ftime_s)
        //struct _timeb t;
 
 // NORMAL CODE (use _ftime_s)
        //struct _timeb t;