Merge pull request #49 from micolous/less-verbose-mfsim

[proxmark3-svn] / client / proxmark3.h

diff --git a/client/proxmark3.h b/client/proxmark3.h
index eebaa49515d89f18f7020bb433b4eb26527b2a36..89cac87818253e6122fc9fa3f0071dff161abe8f 100644 (file)
--- a/client/proxmark3.h
+++ b/client/proxmark3.h
@@ -12,16 +12,21 @@
 #ifndef PROXMARK3_H__
 #define PROXMARK3_H__
 
 #ifndef PROXMARK3_H__
 #define PROXMARK3_H__
 

-#define __STDC_FORMAT_MACROS
+#ifdef __WIN32
+// for MINGW32 environments
+   #define _USE_32BIT_TIME_T 1
+#endif   
+#define __STDC_FORMAT_MACROS 1

 #include <inttypes.h>
 #include <inttypes.h>

+#define lx  PRIx32

 #define llx PRIx64
 #define lli PRIi64
 #define llx PRIx64
 #define lli PRIi64

+#define llu PRIu64

 #define hhu PRIu8
 
 #define hhu PRIu8
 

-#include <usb.h>

 #include "usb_cmd.h"
 
 #include "usb_cmd.h"
 

-#define PROXPROMPT "proxmark3> "
+#define PROXPROMPT "pm3 --> "

 
 void SendCommand(UsbCommand *c);
 
 
 void SendCommand(UsbCommand *c);