monster merge...

all those changes marshmellow did..  and more...
This commit is contained in:
iceman1001 committed 2017-07-30 09:17:48 +02:00
1 parent 208550823d
commit f28da2da6e
107 files changed
+5087 -3777

No files matched your search

+1 -1
View File
@@ -11,7 +11,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include "sleep.h"
#include "util_posix.h"
#include "proxusb.h"
#include "flash.h"
#include "elf.h"
+1 -1
View File
@@ -9,7 +9,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "sleep.h"
#include "util_posix.h"
#include "proxusb.h"
#include "flash.h"
-13
View File
@@ -8,20 +8,7 @@
//-----------------------------------------------------------------------------
// USB utilities
//-----------------------------------------------------------------------------
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
#include <unistd.h>
#include <usb.h>
#include <strings.h>
#include <errno.h>
#include "sleep.h"
#include "proxusb.h"
#include "proxmark3.h"
#include "usb_cmd.h"
// It seems to be missing for mingw
#ifndef ETIMEDOUT
+8
View File
@@ -13,8 +13,16 @@
#include <stdint.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <usb.h>
#include <strings.h>
#include <errno.h>
#include "proxmark3.h"
#include "usb_cmd.h"
#include "util_posix.h"
extern unsigned char return_on_error;
extern unsigned char error_occured;