FIX: Coverity Scan fixes to emvcmd.c among others.

[proxmark3-svn] / client / proxmark3.h

diff --git a/client/proxmark3.h b/client/proxmark3.h
index a634fd68179bf1d29b3bb4a8a29fed6fde3d3080..6874f9d8e471ea3d589855e650f61d77fc1c797f 100644 (file)
--- a/client/proxmark3.h
+++ b/client/proxmark3.h
@@ -8,20 +8,29 @@
 //-----------------------------------------------------------------------------
 // Main binary
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Main binary
 //-----------------------------------------------------------------------------

-

 #ifndef PROXMARK3_H__
 #define PROXMARK3_H__
 
 #ifndef PROXMARK3_H__
 #define PROXMARK3_H__
 

-#define __STDC_FORMAT_MACROS
-#include <inttypes.h>
-#define llx PRIx64
-#define lli PRIi64
-#define hhu PRIu8
+// Handle platform specific includes
+#ifdef _WIN32
+// for MINGW32 environments
+  #ifndef _USE_32BIT_TIME_T
+    #define _USE_32BIT_TIME_T 1
+  #endif  
+  #include <time.h>
+  #include <windows.h>
+#else
+  #include <sys/time.h>
+#endif

 
 

+#define __STDC_FORMAT_MACROS 1
+#include <inttypes.h>

 #include "usb_cmd.h"
 
 #define PROXPROMPT "pm3 --> "
 
 void SendCommand(UsbCommand *c);
 #include "usb_cmd.h"
 
 #define PROXPROMPT "pm3 --> "
 
 void SendCommand(UsbCommand *c);

+const char *get_my_executable_path(void);
+const char *get_my_executable_directory(void);

 
 

-#endif
+#endif
\ No newline at end of file