From 457b7e5f5847baa276b1e251406f0e83633b2951 Mon Sep 17 00:00:00 2001 From: Spoike Date: Tue, 14 Jul 2020 01:16:20 +0000 Subject: [PATCH] Fix warnings. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5729 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/sys_droid.c | 2 +- engine/common/bothdefs.h | 8 ++++++-- engine/web/sys_web.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/engine/client/sys_droid.c b/engine/client/sys_droid.c index a273d55d9..0b3526922 100644 --- a/engine/client/sys_droid.c +++ b/engine/client/sys_droid.c @@ -1069,7 +1069,7 @@ void Sys_CloseTerminal(void) #define SYS_CLIPBOARD_SIZE 256 static char clipboard_buffer[SYS_CLIPBOARD_SIZE] = {0}; -void Sys_Clipboard_PasteText(clipboardtype_t cbt, void (*callback)(void *cb, char *utf8), void *ctx) +void Sys_Clipboard_PasteText(clipboardtype_t cbt, void (*callback)(void *cb, const char *utf8), void *ctx) { callback(ctx, clipboard_buffer); } diff --git a/engine/common/bothdefs.h b/engine/common/bothdefs.h index b6b20f477..d884a2da4 100644 --- a/engine/common/bothdefs.h +++ b/engine/common/bothdefs.h @@ -71,7 +71,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define NO_JPEG #define NO_OGG #define NO_ZLIB - #define NO_FREETYPE + #ifndef NO_FREETYPE + #define NO_FREETYPE + #endif #endif #ifdef D3DQUAKE @@ -337,7 +339,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifdef ANDROID #define GLESONLY //should reduce the conditions a little // #undef HEADLESSQUAKE - #define NO_FREETYPE + #ifndef NO_FREETYPE + #define NO_FREETYPE + #endif #define NO_OPENAL #endif #if defined(NACL) diff --git a/engine/web/sys_web.c b/engine/web/sys_web.c index f2705b64d..c799afd76 100644 --- a/engine/web/sys_web.c +++ b/engine/web/sys_web.c @@ -248,7 +248,7 @@ qboolean Sys_RunInstaller(void) #define SYS_CLIPBOARD_SIZE 256 static char *clipboard_buffer; -void Sys_Clipboard_PasteText(clipboardtype_t cbt, void (*callback)(void *cb, char *utf8), void *ctx) +void Sys_Clipboard_PasteText(clipboardtype_t cbt, void (*callback)(void *cb, const char *utf8), void *ctx) { callback(ctx, clipboard_buffer); }