From 799317fa656ed4eb2e4fe4f05a09c9d54eb98248 Mon Sep 17 00:00:00 2001 From: yabause Date: Fri, 24 Oct 2008 08:13:44 +0000 Subject: [PATCH] Misc fixes by riccardom --- desmume/src/OGLRender.cpp | 2 +- desmume/src/cp15.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/desmume/src/OGLRender.cpp b/desmume/src/OGLRender.cpp index 924d0acb4..227e24260 100644 --- a/desmume/src/OGLRender.cpp +++ b/desmume/src/OGLRender.cpp @@ -442,7 +442,7 @@ void* memcpy_fast(void* dest, const void* src, size_t count) #endif -#ifdef DEBUG_DUMP_TEXTURE && WIN32 +#if defined (DEBUG_DUMP_TEXTURE) && defined (WIN32) static void DebugDumpTexture(int which) { char fname[100]; diff --git a/desmume/src/cp15.cpp b/desmume/src/cp15.cpp index 01dfb0398..c982625d0 100644 --- a/desmume/src/cp15.cpp +++ b/desmume/src/cp15.cpp @@ -82,7 +82,7 @@ armcp15_t *armcp15_new(armcpu_t * c) #define MASKFROMREG(val) (~((SIZEBINARY(val)-1) | 0x3F)) #define SETFROMREG(val) ((val) & MASKFROMREG(val)) /* sets the precalculated regions to mask,set for the affected accesstypes */ -void armcp15_setSingleRegionAccess(armcp15_t *armcp15,unsigned long dAccess,unsigned long iAccess,unsigned char num, unsigned long mask,unsigned long set) { +static void armcp15_setSingleRegionAccess(armcp15_t *armcp15,unsigned long dAccess,unsigned long iAccess,unsigned char num, unsigned long mask,unsigned long set) { switch (ACCESSTYPE(dAccess,num)) { case 4: /* UNP */