marcan's patch until he gets commit access. Remove C library's includes from the...

[proxmark3-svn] / client / proxusb.h

diff --git a/client/proxusb.h b/client/proxusb.h
index e12c9334f059fff11d18ab2db38cfb1bbd2e7417..32a334c68edec7690796388d288c8e57d10d6b2d 100644 (file)
--- a/client/proxusb.h
+++ b/client/proxusb.h
@@ -1,16 +1,11 @@
 #ifndef PROXUSB_H__
 #define PROXUSB_H__
 
 #ifndef PROXUSB_H__
 #define PROXUSB_H__
 

-#ifdef _MSC_VER
-typedef DWORD uint32_t;
-typedef BYTE uint8_t;
-typedef WORD uint16_t;
-#define bool BOOL
-#else

 #include <stdint.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdbool.h>

+#ifndef WIN32
+#include <usb.h>

 #endif
 #endif

-#include "usb.h"

 #include "usb_cmd.h"
 
 extern unsigned char return_on_error;
 #include "usb_cmd.h"
 
 extern unsigned char return_on_error;


@@ -19,9 +14,8 @@ extern unsigned char error_occured;
 void SendCommand(UsbCommand *c);
 bool ReceiveCommandPoll(UsbCommand *c);
 void ReceiveCommand(UsbCommand *c);
 void SendCommand(UsbCommand *c);
 bool ReceiveCommandPoll(UsbCommand *c);
 void ReceiveCommand(UsbCommand *c);

-usb_dev_handle* FindProxmark(int verbose, unsigned int *iface);
-usb_dev_handle* OpenProxmark(int verbose);
-usb_dev_handle* OpenProxmark(int verbose);
+struct usb_dev_handle* FindProxmark(int verbose, unsigned int *iface);
+struct usb_dev_handle* OpenProxmark(int verbose);

 void CloseProxmark(void);
 
 #endif
 void CloseProxmark(void);
 
 #endif