Merge remote-tracking branch 'aveao/patch-1' into emrtd

This commit is contained in:
Ave 2020-12-23 23:00:09 +03:00
commit e87e3816ba

View file

@ -14,9 +14,6 @@
#if !defined(_WIN32)
#define _POSIX_C_SOURCE 200112L
#endif
#ifdef HAVE_READLINE
#include <readline/readline.h>
#endif
#include "ui.h"
#include "commonutil.h" // ARRAYLEN
@ -24,6 +21,10 @@
#include <stdarg.h>
#include <stdlib.h>
#ifdef HAVE_READLINE
#include <readline/readline.h>
#endif
#include <complex.h>
#include "util.h"
#include "proxmark3.h" // PROXLOG