From 021ee95e07599c0fe80d7a03cc1bb4053d7c4afe Mon Sep 17 00:00:00 2001 From: dxl <64101226@qq.com> Date: Wed, 6 May 2020 12:05:14 +0200 Subject: [PATCH] don't mix ifdef and defined --- client/deps/tinycbor/open_memstream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/deps/tinycbor/open_memstream.c b/client/deps/tinycbor/open_memstream.c index 098bf90fe..7a134286f 100644 --- a/client/deps/tinycbor/open_memstream.c +++ b/client/deps/tinycbor/open_memstream.c @@ -36,7 +36,7 @@ # include #endif -#ifdef __APPLE__ || defined(__ANDROID__) || defined(ANDROID) +#if defined(__APPLE__) || defined(__ANDROID__) || defined(ANDROID) typedef int RetType; typedef int LenType; #elif __GLIBC__ @@ -102,7 +102,7 @@ FILE *open_memstream(char **bufptr, size_t *lenptr) { *bufptr = NULL; *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); #elif __GLIBC__ static const cookie_io_functions_t vtable = {