mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-03 16:07:51 +00:00
libretro-fuse: fix compilation with gcc10
This commit is contained in:
parent
bfc49c9c8e
commit
29506634e5
@ -0,0 +1,50 @@
|
||||
From 6640ae1c834c31a776ad1d22c77ed919e8fe3c07 Mon Sep 17 00:00:00 2001
|
||||
From: Vladimir Serbinenko <phcoder@google.com>
|
||||
Date: Wed, 6 May 2020 02:02:59 +0200
|
||||
Subject: [PATCH] Emscripten fixes
|
||||
|
||||
---
|
||||
fuse/ui/widget/widget.c | 2 +-
|
||||
src/libretro.c | 2 +-
|
||||
zlib/gzguts.h | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/fuse/ui/widget/widget.c b/fuse/ui/widget/widget.c
|
||||
index 542a47f..0437cd5 100644
|
||||
--- a/fuse/ui/widget/widget.c
|
||||
+++ b/fuse/ui/widget/widget.c
|
||||
@@ -93,7 +93,7 @@ typedef struct widget_recurse_t {
|
||||
static widget_recurse_t widget_return[10]; /* The stack to recurse on */
|
||||
|
||||
/* The settings used whilst playing with an options dialog box */
|
||||
-settings_info widget_options_settings;
|
||||
+extern settings_info widget_options_settings;
|
||||
|
||||
static int widget_read_font( const char *filename )
|
||||
{
|
||||
diff --git a/src/libretro.c b/src/libretro.c
|
||||
index ba595b7..19948c6 100644
|
||||
--- a/src/libretro.c
|
||||
+++ b/src/libretro.c
|
||||
@@ -476,7 +476,7 @@ static int get_joystick(unsigned device)
|
||||
#ifdef GIT_VERSION
|
||||
static char version[] = PACKAGE_VERSION " " GIT_VERSION;
|
||||
#else
|
||||
-const char *fuse_githash;
|
||||
+extern const char *fuse_githash;
|
||||
static char version[] = PACKAGE_VERSION " .......";
|
||||
#endif
|
||||
|
||||
diff --git a/zlib/gzguts.h b/zlib/gzguts.h
|
||||
index 6463b71..8e83b1d 100644
|
||||
--- a/zlib/gzguts.h
|
||||
+++ b/zlib/gzguts.h
|
||||
@@ -18,7 +18,7 @@
|
||||
# define ZLIB_INTERNAL
|
||||
#endif
|
||||
|
||||
-#ifdef _IOS_ARM64
|
||||
+#if defined(_IOS_ARM64) || defined(EMSCRIPTEN)
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user