diff options
| author | Jaedyn Draper | 2012-12-27 23:19:47 -0800 |
|---|---|---|
| committer | Jaedyn Draper | 2012-12-27 23:19:47 -0800 |
| commit | 3fff289e60df73b25c483807f5cf73c011804117 (patch) | |
| tree | d8a44c6256c2a7652b028525054e0e55d756ff15 /source/memmap.h | |
| parent | 74211924afc184870627c90ce522c4c5743761db (diff) | |
| parent | c01a2a42168695233ecc69c4a60ed918e7701fb9 (diff) | |
| download | snesemu-3fff289e60df73b25c483807f5cf73c011804117.tar.gz snesemu-3fff289e60df73b25c483807f5cf73c011804117.tar.bz2 snesemu-3fff289e60df73b25c483807f5cf73c011804117.zip | |
Merge pull request #26 from Nebuleon/master
Merge to CATSFC 1.10+
Diffstat (limited to 'source/memmap.h')
| -rw-r--r-- | source/memmap.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/memmap.h b/source/memmap.h index 58f0c9f..f838065 100644 --- a/source/memmap.h +++ b/source/memmap.h @@ -276,7 +276,7 @@ bool8 LoadZip(const char* zipname, END_EXTERN_C extern "C" { -void S9xAutoSaveSRAM (); + void S9xAutoSaveSRAM (); } #ifdef NO_INLINE_SET_GET @@ -288,9 +288,12 @@ void S9xSetPCBase (uint32 Address); uint8 *S9xGetMemPointer (uint32 Address); uint8 *GetBasePointer (uint32 Address); -extern "C"{ -extern uint8 OpenBus; +#ifndef NO_OPEN_BUS +extern "C" { + extern uint8 OpenBus; } +#endif + #else #define INLINE inline #include "getset.h" |