From eef46fe743fd71ce2051f9ab83299e2bd330522f Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sat, 10 Oct 2015 18:41:43 +0200 Subject: [PATCH] Revert previous change and just removed inline on the function --- JGE/include/vram.h | 6 +----- JGE/src/vram.cpp | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/JGE/include/vram.h b/JGE/include/vram.h index 4c1933d30..09147ada9 100644 --- a/JGE/include/vram.h +++ b/JGE/include/vram.h @@ -32,11 +32,7 @@ extern "C" { #endif -//void* vrelptr( void *ptr ); // make a pointer relative to memory base address (ATTENTION: A NULL rel ptr is not illegal/invalid!) -inline void* vrelptr(void *ptr) -{ - return (void*)((unsigned int)ptr & ~__MEM_START); -}; +void* vrelptr( void *ptr ); // make a pointer relative to memory base address (ATTENTION: A NULL rel ptr is not illegal/invalid!) void* vabsptr( void *ptr ); // make a pointer absolute (default return type of valloc) diff --git a/JGE/src/vram.cpp b/JGE/src/vram.cpp index 2d8f3e104..270481f17 100644 --- a/JGE/src/vram.cpp +++ b/JGE/src/vram.cpp @@ -75,7 +75,7 @@ static int __largest_block = __MEM_BLOCKS; static int __mem_free = __MEM_BLOCKS; -inline void* vrelptr( void *ptr ) +void* vrelptr( void *ptr ) { return (void*)((unsigned int)ptr & ~__MEM_START); }