github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 13:00:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Chg: android adaptions from @xianglin1998

Browse source
This commit is contained in:
iceman1001 2020-04-16 16:46:09 +02:00
commit 1bf32aad90
4 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/deps/cliparser/argtable3.c
View file

@ -83,8 +83,9 @@ enum {
EMINCOUNT = 1, EMINCOUNT = 1,
EMAXCOUNT, EMAXCOUNT,
EBADINT, EBADINT,
// The same name define EOVERFLOW in errno.h on windows platform
#ifdef __STDC_WANT_SECURE_LIB__ // The same name define EOVERFLOW in errno.h on windows platform or android
#if defined(__STDC_WANT_SECURE_LIB__) || defined(__ANDROID__) || defined(ANDROID)
EOVERFLOW_, EOVERFLOW_,
#else #else
EOVERFLOW, EOVERFLOW,

8
client/deps/jansson/jansson_config.h
View file

@ -33,9 +33,13 @@
#define JSON_INTEGER_IS_LONG_LONG 1 #define JSON_INTEGER_IS_LONG_LONG 1
/* If locale.h and localeconv() are available, define to 1, /* If locale.h and localeconv() are available, define to 1,
otherwise to 0. */ otherwise to 0. tips: android don't support localeconv()
*/
#if defined(__ANDROID__) || defined(ANDROID)
#define JSON_HAVE_LOCALECONV 0
#else
#define JSON_HAVE_LOCALECONV 1 #define JSON_HAVE_LOCALECONV 1
#endif
/* If __atomic builtins are available they will be used to manage /* If __atomic builtins are available they will be used to manage
reference counts of json_t. */ reference counts of json_t. */
#define JSON_HAVE_ATOMIC_BUILTINS 1 #define JSON_HAVE_ATOMIC_BUILTINS 1

5
client/deps/tinycbor/open_memstream.c
View file

@ -35,7 +35,8 @@
#if defined(__unix__) || defined(__APPLE__) #if defined(__unix__) || defined(__APPLE__)
# include <unistd.h> # include <unistd.h>
#endif #endif
#ifdef __APPLE__
#ifdef __APPLE__ || defined(__ANDROID__) || defined(ANDROID)
typedef int RetType; typedef int RetType;
typedef int LenType; typedef int LenType;
#elif __GLIBC__ #elif __GLIBC__
@ -101,7 +102,7 @@ FILE *open_memstream(char **bufptr, size_t *lenptr) {
*bufptr = NULL; *bufptr = NULL;
*lenptr = 0; *lenptr = 0;
#ifdef __APPLE__ #ifdef __APPLE__ || defined(__ANDROID__) || defined(ANDROID)
return funopen(b, NULL, write_to_buffer, NULL, close_buffer); return funopen(b, NULL, write_to_buffer, NULL, close_buffer);
#elif __GLIBC__ #elif __GLIBC__
static const cookie_io_functions_t vtable = { static const cookie_io_functions_t vtable = {

6
client/src/ui.c
View file

@ -21,15 +21,21 @@
#include <stdio.h> // for Mingw readline #include <stdio.h> // for Mingw readline
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#ifndef ANDROID
#include <readline/readline.h> #include <readline/readline.h>
#endif
#include <complex.h> #include <complex.h>
#include "util.h" #include "util.h"
#include "proxmark3.h" // PROXLOG #include "proxmark3.h" // PROXLOG
#include "fileutils.h" #include "fileutils.h"
#include "pm3_cmd.h" #include "pm3_cmd.h"
#ifdef _WIN32 #ifdef _WIN32
# include <direct.h> // _mkdir # include <direct.h> // _mkdir
#endif #endif
#include <time.h> #include <time.h>
#include "emojis.h" #include "emojis.h"
#include "emojis_alt.h" #include "emojis_alt.h"