From 9889f34180d8bb4bde525c2b3261f082b59b8c78 Mon Sep 17 00:00:00 2001
From: Alcaro <floating@muncher.se>
Date: Wed, 31 Jan 2018 00:39:27 +0100
Subject: [PATCH] Fix this issue
 https://forums.libretro.com/t/issue-linking-libco/14482

---
 libretro-common/libco/amd64.c    | 6 +++---
 libretro-common/libco/armeabi.c  | 2 +-
 libretro-common/libco/psp2.c     | 2 +-
 libretro-common/libco/scefiber.c | 2 +-
 libretro-common/libco/x86.c      | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libretro-common/libco/amd64.c b/libretro-common/libco/amd64.c
index 24944159fd..cd38a65534 100644
--- a/libretro-common/libco/amd64.c
+++ b/libretro-common/libco/amd64.c
@@ -74,7 +74,7 @@ static unsigned char co_swap_function[] = {
 
 #include <windows.h>
 
-void co_init(void)
+static void co_init(void)
 {
    DWORD old_privileges;
    VirtualProtect(co_swap_function,
@@ -105,7 +105,7 @@ static unsigned char co_swap_function[] = {
 #include <unistd.h>
 #include <sys/mman.h>
 
-void co_init(void)
+static void co_init(void)
 {
    unsigned long long addr = (unsigned long long)co_swap_function;
    unsigned long long base = addr - (addr % sysconf(_SC_PAGESIZE));
@@ -113,7 +113,7 @@ void co_init(void)
    mprotect((void*)base, size, PROT_READ | PROT_WRITE | PROT_EXEC);
 }
 #else
-void co_init(void) {}
+static void co_init(void) {}
 #endif
 #endif
 
diff --git a/libretro-common/libco/armeabi.c b/libretro-common/libco/armeabi.c
index 71e6df9f29..f65aaa2e4b 100644
--- a/libretro-common/libco/armeabi.c
+++ b/libretro-common/libco/armeabi.c
@@ -22,7 +22,7 @@ extern "C" {
 static thread_local uint32_t co_active_buffer[64];
 static thread_local cothread_t co_active_handle;
 
-asm (
+__asm__ (
 #if defined(__thumb2__)
       ".thumb\n"
       ".align 2\n"
diff --git a/libretro-common/libco/psp2.c b/libretro-common/libco/psp2.c
index eaf9b7a58f..cb7e03e3fe 100644
--- a/libretro-common/libco/psp2.c
+++ b/libretro-common/libco/psp2.c
@@ -35,7 +35,7 @@ extern "C" {
       0xe12fff1e,  /* bx lr                     */
    };
 
-   void co_init()
+   static void co_init()
    {
       int ret;
       void *base;
diff --git a/libretro-common/libco/scefiber.c b/libretro-common/libco/scefiber.c
index a233bec33c..11f521d607 100644
--- a/libretro-common/libco/scefiber.c
+++ b/libretro-common/libco/scefiber.c
@@ -29,7 +29,7 @@ int32_t sceFiberSwitch(SceFiber* fiber, uint32_t argOnRunTo, uint32_t* argOnRun)
 
 int32_t sceFiberReturnToThread(uint32_t argOnReturn, uint32_t* argOnRun);
 
-void co_thunk(uint32_t argOnInitialize, uint32_t argOnRun)
+static void co_thunk(uint32_t argOnInitialize, uint32_t argOnRun)
 {
    ((void (*)(void))argOnInitialize)();
 }
diff --git a/libretro-common/libco/x86.c b/libretro-common/libco/x86.c
index ae1676664b..1a1d01d0d8 100644
--- a/libretro-common/libco/x86.c
+++ b/libretro-common/libco/x86.c
@@ -44,7 +44,7 @@ static unsigned char co_swap_function[] = {
 #ifdef _WIN32
 #include <windows.h>
 
-void co_init(void)
+static void co_init(void)
 {
    DWORD old_privileges;
    VirtualProtect(co_swap_function,
@@ -54,7 +54,7 @@ void co_init(void)
 #include <unistd.h>
 #include <sys/mman.h>
 
-void co_init(void)
+static void co_init(void)
 {
    unsigned long addr = (unsigned long)co_swap_function;
    unsigned long base = addr - (addr % sysconf(_SC_PAGESIZE));