Resolved Conflicts

[proxmark3-svn] / client / proxmark3.h

diff --git a/client/proxmark3.h b/client/proxmark3.h
index 616d9c70aebfd1373262fb689938fcadfe741b0a..86d09bc00e875bfd125d59e21054b0c1ad56f0ac 100644 (file)
--- a/client/proxmark3.h
+++ b/client/proxmark3.h
@@ -12,17 +12,20 @@
 #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 llu PRIu64
-#define hhu PRIu8
-

 #include "usb_cmd.h"
 
 #define PROXPROMPT "proxmark3> "
 
 #include "usb_cmd.h"
 
 #define PROXPROMPT "proxmark3> "
 

-void SendCommand(UsbCommand *c);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const char *get_my_executable_path(void);
+const char *get_my_executable_directory(void);
+void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present);
+
+#ifdef __cplusplus
+}
+#endif

 
 #endif
 
 #endif