FIX: removed some warnings about time_t in non-windows systems. This appeared since...

diff --git a/client/util.c b/client/util.c
index a6ba8e81d16622d951f0e15a7684fdfa4f5ac9a9..3a7cbac40cc2a3ee0bdb07d9d7c6c7bdf529b4f2 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -12,9 +12,6 @@
 #define MAX_BIN_BREAK_LENGTH   (3072+384+1)
 
 #ifndef _WIN32
 #define MAX_BIN_BREAK_LENGTH   (3072+384+1)
 
 #ifndef _WIN32

-#include <termios.h>
-#include <sys/ioctl.h> 
-

 int ukbhit(void) {
   int cnt = 0;
   int error;
 int ukbhit(void) {
   int cnt = 0;
   int error;


@@ -38,7 +35,6 @@ int ukbhit(void) {
 }
 
 #else
 }
 
 #else

-#include <conio.h>

 int ukbhit(void) {
        return kbhit();
 }
 int ukbhit(void) {
        return kbhit();
 }

diff --git a/client/util.h b/client/util.h
index 7a2fd46fce495375939a4ebb64c7dd584214438e..de1fa095d03f5301dd37ee5eadea58e315c3cfa2 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -17,6 +17,18 @@
 #include "proxmark3.h" // time_t
 #include "data.h"              // for FILE_PATH_SIZE
 
 #include "proxmark3.h" // time_t
 #include "data.h"              // for FILE_PATH_SIZE
 

+// Handle platform specific includes
+#ifndef _WIN32
+  #include <termios.h>
+  #include <sys/ioctl.h>
+  #include <sys/time.h>
+#else
+  #include <conio.h>
+  #include <time.h>
+  #include <windows.h>
+#endif
+
+

 #ifndef BITMASK
 # define BITMASK(X) (1 << (X))
 #endif
 #ifndef BITMASK
 # define BITMASK(X) (1 << (X))
 #endif