X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/df007486f5119620e09930b030c29b62e67bb0b4..beb2ce1f2dd06501d2bc914d8b19a3ea65c02e8f:/client/util.h?ds=sidebyside

diff --git a/client/util.h b/client/util.h
index f81d7d88..593c9af7 100644
--- a/client/util.h
+++ b/client/util.h
@@ -7,16 +7,30 @@
 //-----------------------------------------------------------------------------
 // utilities
 //-----------------------------------------------------------------------------
+#ifndef __UTIL_H_
+#define __UTIL_H_
 
 #include <stdio.h>
 #include <stdint.h>		//included in data.h
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <time.h>
 #include <math.h>		// math.pow
+#include <time.h>       // time, gmtime
+#include "proxmark3.h"	// time_t
 #include "data.h"		// for FILE_PATH_SIZE
-#include "proxmark3.h"
+
+#include <time.h>
+// Handle platform specific includes
+#ifndef _WIN32
+  #include <termios.h>
+  #include <sys/ioctl.h>
+  #include <sys/time.h>
+#else
+  #include <conio.h>
+  #include <windows.h>
+#endif
+
 
 #ifndef BITMASK
 # define BITMASK(X) (1 << (X))
@@ -93,6 +107,7 @@ char *sprint_hex(const uint8_t * data, const size_t len);
 char *sprint_bin(const uint8_t * data, const size_t len);
 char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks);
 char *sprint_hex_ascii(const uint8_t *data, const size_t len);
+char *sprint_ascii(const uint8_t *data, const size_t len);
 
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest);
 uint64_t bytes_to_num(uint8_t* src, size_t len);
@@ -127,4 +142,6 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits);
 void rol(uint8_t *data, const size_t len);
 uint32_t SwapBits(uint32_t value, int nrbits);
 uint32_t reflect(uint32_t v, int b);
-uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor);
\ No newline at end of file
+uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor);
+
+#endif
\ No newline at end of file