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

don't mix ifdef and defined

Browse source
This commit is contained in:
dxl 2020-05-06 12:05:14 +02:00 • committed by Philippe Teuwen
commit 021ee95e07
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,7 +36,7 @@
# include <unistd.h> # include <unistd.h>
#endif #endif
#ifdef __APPLE__ || defined(__ANDROID__) || defined(ANDROID) #if defined(__APPLE__) || defined(__ANDROID__) || defined(ANDROID)
typedef int RetType; typedef int RetType;
typedef int LenType; typedef int LenType;
#elif __GLIBC__ #elif __GLIBC__
@ -102,7 +102,7 @@ FILE *open_memstream(char **bufptr, size_t *lenptr) {
*bufptr = NULL; *bufptr = NULL;
*lenptr = 0; *lenptr = 0;
#ifdef __APPLE__ || defined(__ANDROID__) || defined(ANDROID) #if defined(__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 = {