From 12c6b5cb20b12aacb52a136dce3a51193735793b Mon Sep 17 00:00:00 2001 From: merlokk <807634+merlokk@users.noreply.github.com> Date: Tue, 16 Jul 2019 15:25:48 +0300 Subject: [PATCH] add the definition of PACKED in its client/deprecated-hid-flasher/flasher/proxmark3.h --- client/deprecated-hid-flasher/flasher/elf.h | 2 +- client/deprecated-hid-flasher/flasher/proxmark3.h | 12 ++++++++++++ client/deprecated-hid-flasher/flasher/usb_cmd.h | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/client/deprecated-hid-flasher/flasher/elf.h b/client/deprecated-hid-flasher/flasher/elf.h index 50533224f..eef2863d8 100644 --- a/client/deprecated-hid-flasher/flasher/elf.h +++ b/client/deprecated-hid-flasher/flasher/elf.h @@ -9,7 +9,7 @@ #ifndef __ELF_H__ #define __ELF_H__ -#include "common.h" +#include "proxmark3.h" typedef struct { uint32_t p_type; diff --git a/client/deprecated-hid-flasher/flasher/proxmark3.h b/client/deprecated-hid-flasher/flasher/proxmark3.h index f5dd2b7fa..c9e42efd8 100644 --- a/client/deprecated-hid-flasher/flasher/proxmark3.h +++ b/client/deprecated-hid-flasher/flasher/proxmark3.h @@ -14,4 +14,16 @@ #define PROXPROMPT "proxmark3> " +#ifdef _MSC_VER +typedef DWORD uint32_t; +typedef BYTE uint8_t; +#define PACKED +// stuff +#else +#include +#include +#define PACKED __attribute__((packed)) +#endif + + #endif diff --git a/client/deprecated-hid-flasher/flasher/usb_cmd.h b/client/deprecated-hid-flasher/flasher/usb_cmd.h index 95cca0cfc..60c359e5a 100644 --- a/client/deprecated-hid-flasher/flasher/usb_cmd.h +++ b/client/deprecated-hid-flasher/flasher/usb_cmd.h @@ -13,7 +13,7 @@ #ifndef __USB_CMD_H #define __USB_CMD_H -#include "common.h" +#include "proxmark3.h" typedef struct { uint32_t cmd;