From: iceman1001 <iceman@iuse.se>
Date: Wed, 16 Nov 2016 17:36:21 +0000 (+0100)
Subject: FIX:  removed some warnings about time_t in non-windows systems.  This appeared since... 
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/1ca5dce0f4d297d739010ca5fc5954683fa3ec1a

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

diff --git a/client/util.c b/client/util.c
index a6ba8e81..3a7cbac4 100644
--- a/client/util.c
+++ b/client/util.c
@@ -12,9 +12,6 @@
 #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;
@@ -38,7 +35,6 @@ int ukbhit(void) {
 }
 
 #else
-#include <conio.h>
 int ukbhit(void) {
 	return kbhit();
 }
diff --git a/client/util.h b/client/util.h
index 7a2fd46f..de1fa095 100644
--- a/client/util.h
+++ b/client/util.h
@@ -17,6 +17,18 @@
 #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