Skip to content

Commit 82fc715

Browse files
KonstantyKonstanty
authored
Merge pull request #45 from sezero/MSC_VER
MSC_VER preprocessor check corrections
2 parents 45e5528 + a3ba439 commit 82fc715

File tree

8 files changed

+21
-30
lines changed

8 files changed

+21
-30
lines changed

‎src/fastmix.cpp‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "sndfile.h"
1010
#include <math.h>
1111

12-
#ifdef MSC_VER
12+
#if defined(_MSC_VER) && defined(_M_IX86)
1313
#pragma bss_seg(".modplug")
1414
#endif
1515

@@ -27,7 +27,7 @@ int MixRearBuffer[MIXBUFFERSIZE*2];
2727
float MixFloatBuffer[MIXBUFFERSIZE*2];
2828
#endif
2929

30-
#ifdef MSC_VER
30+
#if defined(_MSC_VER) && defined(_M_IX86)
3131
#pragma bss_seg()
3232
#endif
3333

@@ -1611,7 +1611,7 @@ UINT CSoundFile::CreateStereoMix(int count)
16111611
#endif
16121612

16131613
// Clip and convert to 8 bit
1614-
#ifdef MSC_VER
1614+
#if defined(_MSC_VER) && defined(_M_IX86)
16151615
__declspec(naked) DWORD MPPASMCALL X86_Convert32To8(LPVOID lp16, int *pBuffer, DWORD lSampleCount, LPLONG lpMin, LPLONG lpMax)
16161616
//------------------------------------------------------------------------------
16171617
{
@@ -1701,7 +1701,7 @@ DWORD MPPASMCALL X86_Convert32To8(LPVOID lp8, int *pBuffer, DWORD lSampleCount,
17011701
#endif //MSC_VER, else
17021702

17031703

1704-
#ifdef MSC_VER
1704+
#if defined(_MSC_VER) && defined(_M_IX86)
17051705
// Clip and convert to 16 bit
17061706
__declspec(naked) DWORD MPPASMCALL X86_Convert32To16(LPVOID lp16, int *pBuffer, DWORD lSampleCount, LPLONG lpMin, LPLONG lpMax)
17071707
//------------------------------------------------------------------------------
@@ -1794,7 +1794,7 @@ DWORD MPPASMCALL X86_Convert32To16(LPVOID lp16, int *pBuffer, DWORD lSampleCount
17941794
}
17951795
#endif //MSC_VER, else
17961796

1797-
#ifdef MSC_VER
1797+
#if defined(_MSC_VER) && defined(_M_IX86)
17981798
// Clip and convert to 24 bit
17991799
__declspec(naked) DWORD MPPASMCALL X86_Convert32To24(LPVOID lp16, int *pBuffer, DWORD lSampleCount, LPLONG lpMin, LPLONG lpMax)
18001800
//------------------------------------------------------------------------------
@@ -1902,7 +1902,7 @@ DWORD MPPASMCALL X86_Convert32To24(LPVOID lp16, int *pBuffer, DWORD lSampleCount
19021902
}
19031903
#endif
19041904

1905-
#ifdef MSC_VER
1905+
#if defined(_MSC_VER) && defined(_M_IX86)
19061906
// Clip and convert to 32 bit
19071907
__declspec(naked) DWORD MPPASMCALL X86_Convert32To32(LPVOID lp16, int *pBuffer, DWORD lSampleCount, LPLONG lpMin, LPLONG lpMax)
19081908
//------------------------------------------------------------------------------
@@ -1992,7 +1992,7 @@ DWORD MPPASMCALL X86_Convert32To32(LPVOID lp16, int *pBuffer, DWORD lSampleCount
19921992
#endif
19931993

19941994

1995-
#ifdef MSC_VER
1995+
#if defined(_MSC_VER) && defined(_M_IX86)
19961996
void MPPASMCALL X86_InitMixBuffer(int *pBuffer, UINT nSamples)
19971997
//------------------------------------------------------------
19981998
{
@@ -2034,7 +2034,7 @@ void MPPASMCALL X86_InitMixBuffer(int *pBuffer, UINT nSamples)
20342034
#endif
20352035

20362036

2037-
#ifdef MSC_VER
2037+
#if defined(_MSC_VER) && defined(_M_IX86)
20382038
__declspec(naked) void MPPASMCALL X86_InterleaveFrontRear(int *pFrontBuf, int *pRearBuf, DWORD nSamples)
20392039
//------------------------------------------------------------------------------
20402040
{
@@ -2079,7 +2079,7 @@ void MPPASMCALL X86_InterleaveFrontRear(int *pFrontBuf, int *pRearBuf, DWORD nSa
20792079
#endif
20802080

20812081

2082-
#ifdef MSC_VER
2082+
#if defined(_MSC_VER) && defined(_M_IX86)
20832083
VOID MPPASMCALL X86_MonoFromStereo(int *pMixBuf, UINT nSamples)
20842084
//-------------------------------------------------------------
20852085
{
@@ -2116,7 +2116,7 @@ VOID MPPASMCALL X86_MonoFromStereo(int *pMixBuf, UINT nSamples)
21162116
#define OFSDECAYMASK 0xFF
21172117

21182118

2119-
#ifdef MSC_VER
2119+
#if defined(_MSC_VER) && defined(_M_IX86)
21202120
void MPPASMCALL X86_StereoFill(int *pBuffer, UINT nSamples, LPLONG lpROfs, LPLONG lpLOfs)
21212121
//------------------------------------------------------------------------------
21222122
{
@@ -2217,7 +2217,7 @@ void MPPASMCALL X86_StereoFill(int *pBuffer, UINT nSamples, LPLONG lpROfs, LPLON
22172217
}
22182218
#endif
22192219

2220-
#ifdef MSC_VER
2220+
#if defined(_MSC_VER) && defined(_M_IX86)
22212221
void MPPASMCALL X86_EndChannelOfs(MODCHANNEL *pChannel, int *pBuffer, UINT nSamples)
22222222
//------------------------------------------------------------------------------
22232223
{
@@ -2291,7 +2291,7 @@ void MPPASMCALL X86_EndChannelOfs(MODCHANNEL *pChannel, int *pBuffer, UINT nSamp
22912291
#define MIXING_LIMITMAX (0x08100000)
22922292
#define MIXING_LIMITMIN (-MIXING_LIMITMAX)
22932293

2294-
#ifdef MSC_VER
2294+
#if defined(_MSC_VER) && defined(_M_IX86)
22952295
__declspec(naked) UINT MPPASMCALL X86_AGC(int *pBuffer, UINT nSamples, UINT nAGC)
22962296
//------------------------------------------------------------------------------
22972297
{
@@ -2327,7 +2327,6 @@ __declspec(naked) UINT MPPASMCALL X86_AGC(int *pBuffer, UINT nSamples, UINT nAGC
23272327
jmp agcrecover
23282328
}
23292329
}
2330-
23312330
#pragma warning (default:4100)
23322331
#else
23332332
// Version for GCC
@@ -2378,11 +2377,9 @@ void CSoundFile::ProcessAGC(int count)
23782377
}
23792378

23802379

2381-
23822380
void CSoundFile::ResetAGC()
23832381
//-------------------------
23842382
{
23852383
gnAGC = AGC_UNITY;
23862384
}
2387-
23882385
#endif // NO_AGC

‎src/libmodplug/sndfile.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ typedef struct WAVEEXTRAHEADER
943943
#define AGC_UNITY (1 << AGC_PRECISION)
944944

945945
// Calling conventions
946-
#ifdef MSC_VER
946+
#if defined(_MSC_VER) && defined(_M_IX86)
947947
#define MPPASMCALL __cdecl
948948
#define MPPFASTCALL __fastcall
949949
#else

‎src/libmodplug/stdafx.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#ifdef _WIN32
2929

30-
#ifdef MSC_VER
30+
#ifdef _MSC_VER
3131
#pragma warning (disable:4201)
3232
#pragma warning (disable:4514)
3333
#endif

‎src/load_xm.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
////////////////////////////////////////////////////////
1212
// FastTracker II XM file support
1313

14-
#ifdef MSC_VER
14+
#ifdef _MSC_VER
1515
#pragma warning(disable:4244)
1616
#endif
1717

‎src/snd_flt.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313

1414
#ifndef NO_FILTER
1515

16-
#ifdef MSC_VER
16+
#if defined(_MSC_VER) && defined(_M_IX86)
1717
#define _ASM_MATH
1818
#endif
1919

2020
#ifdef _ASM_MATH
21-
2221
// pow(a,b) returns a^^b -> 2^^(b.log2(a))
2322
static float pow(float a, float b)
2423
{
@@ -42,7 +41,6 @@ static float pow(float a, float b)
4241
return result;
4342
}
4443

45-
4644
#else
4745

4846
#include <math.h>

‎src/snd_fx.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "sndfile.h"
1010
#include "tables.h"
1111

12-
#ifdef MSC_VER
12+
#ifdef _MSC_VER
1313
#pragma warning(disable:4244)
1414
#endif
1515

‎src/sndfile.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1671,8 +1671,7 @@ void CSoundFile::AdjustSampleLoop(MODINSTRUMENT *pIns)
16711671
DWORD CSoundFile::TransposeToFrequency(int transp, int ftune)
16721672
//-----------------------------------------------------------
16731673
{
1674-
1675-
#ifdef MSC_VER
1674+
#if defined(_MSC_VER) && defined(_M_IX86)
16761675
const float _fbase = 8363;
16771676
const float _factor = 1.0f/(12.0f*128.0f);
16781677
int result;
@@ -1712,8 +1711,7 @@ DWORD CSoundFile::TransposeToFrequency(int transp, int ftune)
17121711
int CSoundFile::FrequencyToTranspose(DWORD freq)
17131712
//----------------------------------------------
17141713
{
1715-
1716-
#ifdef MSC_VER
1714+
#if defined(_MSC_VER) && defined(_M_IX86)
17171715
const float _f1_8363 = 1.0f / 8363.0f;
17181716
const float _factor = 128 * 12;
17191717
LONG result;

‎src/sndmix.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ const UINT PreAmpAGCTable[16] =
8080
// Return (a*b)/c - no divide error
8181
int _muldiv(long a, long b, long c)
8282
{
83-
#ifdef MSC_VER
83+
#if defined(_MSC_VER) && defined(_M_IX86)
8484
int sign, result;
8585
_asm {
8686
mov eax, a
@@ -123,11 +123,10 @@ int _muldiv(long a, long b, long c)
123123
#endif
124124
}
125125

126-
127126
// Return (a*b+c/2)/c - no divide error
128127
int _muldivr(long a, long b, long c)
129128
{
130-
#ifdef MSC_VER
129+
#if defined(_MSC_VER) && defined(_M_IX86)
131130
int sign, result;
132131
_asm {
133132
mov eax, a
@@ -340,7 +339,6 @@ UINT CSoundFile::Read(LPVOID lpDestBuffer, UINT cbBuffer)
340339
}
341340

342341

343-
344342
/////////////////////////////////////////////////////////////////////////////
345343
// Handles navigation/effects
346344

0 commit comments

Comments
 (0)