From 6c65ae370ed62c84fde8359192bfbdb4722396d6 Mon Sep 17 00:00:00 2001 From: gbeauche <> Date: Sun, 5 Jun 2005 07:32:23 +0000 Subject: [PATCH] Fix build with NO_INLINE_MEMORY_ACCESS set --- BasiliskII/src/uae_cpu/memory.cpp | 12 ++++++------ BasiliskII/src/uae_cpu/memory.h | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/BasiliskII/src/uae_cpu/memory.cpp b/BasiliskII/src/uae_cpu/memory.cpp index 0ef4253f..df6d0905 100644 --- a/BasiliskII/src/uae_cpu/memory.cpp +++ b/BasiliskII/src/uae_cpu/memory.cpp @@ -37,27 +37,27 @@ addrbank mem_banks[65536]; #endif #ifdef NO_INLINE_MEMORY_ACCESS -__inline__ uae_u32 longget (uaecptr addr) +uae_u32 longget (uaecptr addr) { return call_mem_get_func (get_mem_bank (addr).lget, addr); } -__inline__ uae_u32 wordget (uaecptr addr) +uae_u32 wordget (uaecptr addr) { return call_mem_get_func (get_mem_bank (addr).wget, addr); } -__inline__ uae_u32 byteget (uaecptr addr) +uae_u32 byteget (uaecptr addr) { return call_mem_get_func (get_mem_bank (addr).bget, addr); } -__inline__ void longput (uaecptr addr, uae_u32 l) +void longput (uaecptr addr, uae_u32 l) { call_mem_put_func (get_mem_bank (addr).lput, addr, l); } -__inline__ void wordput (uaecptr addr, uae_u32 w) +void wordput (uaecptr addr, uae_u32 w) { call_mem_put_func (get_mem_bank (addr).wput, addr, w); } -__inline__ void byteput (uaecptr addr, uae_u32 b) +void byteput (uaecptr addr, uae_u32 b) { call_mem_put_func (get_mem_bank (addr).bput, addr, b); } diff --git a/BasiliskII/src/uae_cpu/memory.h b/BasiliskII/src/uae_cpu/memory.h index 3a289be3..558c5c26 100644 --- a/BasiliskII/src/uae_cpu/memory.h +++ b/BasiliskII/src/uae_cpu/memory.h @@ -88,8 +88,6 @@ extern void map_banks(addrbank *bank, int first, int count); #else -extern uae_u32 alongget(uaecptr addr); -extern uae_u32 awordget(uaecptr addr); extern uae_u32 longget(uaecptr addr); extern uae_u32 wordget(uaecptr addr); extern uae_u32 byteget(uaecptr addr);