diff options
| author | dhewg | 2011-04-23 03:30:19 +0200 |
|---|---|---|
| committer | dhewg | 2011-04-23 03:39:38 +0200 |
| commit | e19fe1c53fb9433a188618d94cc8a3f5a15fd5d8 (patch) | |
| tree | 82e7f9077171c933718b150aedce771bec08630d | |
| parent | 983b044ccb9b82eabd8d3b667822c3693ddb4e6d (diff) | |
| download | scummvm-rg350-e19fe1c53fb9433a188618d94cc8a3f5a15fd5d8.tar.gz scummvm-rg350-e19fe1c53fb9433a188618d94cc8a3f5a15fd5d8.tar.bz2 scummvm-rg350-e19fe1c53fb9433a188618d94cc8a3f5a15fd5d8.zip | |
ASM: Defines do not get mangled
| -rw-r--r-- | audio/rate_arm.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/smush/codec47.cpp | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/audio/rate_arm.cpp b/audio/rate_arm.cpp index 43172f64c8..9c0e849c81 100644 --- a/audio/rate_arm.cpp +++ b/audio/rate_arm.cpp @@ -129,13 +129,11 @@ SimpleRateConverter<stereo, reverseStereo>::SimpleRateConverter(st_rate_t inrate sr.inLen = 0; } -extern "C" { #ifndef IPHONE #define ARM_SimpleRate_M _ARM_SimpleRate_M #define ARM_SimpleRate_S _ARM_SimpleRate_S #define ARM_SimpleRate_R _ARM_SimpleRate_R #endif -} extern "C" st_sample_t *ARM_SimpleRate_M( AudioStream &input, diff --git a/engines/scumm/smush/codec47.cpp b/engines/scumm/smush/codec47.cpp index 333fdabccf..3a1639c35f 100644 --- a/engines/scumm/smush/codec47.cpp +++ b/engines/scumm/smush/codec47.cpp @@ -342,11 +342,9 @@ void Codec47Decoder::makeTables47(int width) { #ifdef USE_ARM_SMUSH_ASM -extern "C" { #ifndef IPHONE #define ARM_Smush_decode2 _ARM_Smush_decode2 #endif -} extern "C" void ARM_Smush_decode2( byte *dst, const byte *src, |