X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7fe9b0b742d7dae9c5af1d292d11840b5c3cbfae..5e174a511b37e17cd3fcaedad608ce605ba34ce9:/client/proxusb.h diff --git a/client/proxusb.h b/client/proxusb.h index a6e27ddf..32a334c6 100644 --- a/client/proxusb.h +++ b/client/proxusb.h @@ -1,16 +1,11 @@ #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 #include -#endif +#ifndef WIN32 #include +#endif #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); -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