diff --git a/Source/CxbxKrnl/EmuD3D8/VertexShader.cpp b/Source/CxbxKrnl/EmuD3D8/VertexShader.cpp index eaad9aaf8..22a643fa1 100644 --- a/Source/CxbxKrnl/EmuD3D8/VertexShader.cpp +++ b/Source/CxbxKrnl/EmuD3D8/VertexShader.cpp @@ -436,7 +436,7 @@ static const char* OReg_Name[] = "a0.x" }; -static inline IsInUse(const boolean *pMask) +static inline int IsInUse(const boolean *pMask) { return (pMask[0] || pMask[1] || pMask[2] || pMask[3]); } @@ -473,10 +473,10 @@ static inline boolean HasILUO(VSH_SHADER_INSTRUCTION *pInstruction) } // Retrieves a number of bits in the instruction token -static inline VshGetFromToken(uint32 *pShaderToken, - uint08 SubToken, - uint08 StartBit, - uint08 BitLength) +static inline int VshGetFromToken(uint32 *pShaderToken, + uint08 SubToken, + uint08 StartBit, + uint08 BitLength) { return (pShaderToken[SubToken] >> StartBit) & ~(0xFFFFFFFF << BitLength); } diff --git a/Source/CxbxKrnl/EmuKrnl.cpp b/Source/CxbxKrnl/EmuKrnl.cpp index c16b1a99c..4b2bcd8f2 100644 --- a/Source/CxbxKrnl/EmuKrnl.cpp +++ b/Source/CxbxKrnl/EmuKrnl.cpp @@ -41,6 +41,7 @@ namespace xboxkrnl }; #include +#include #include #include diff --git a/Source/CxbxKrnl/EmuXapi.cpp b/Source/CxbxKrnl/EmuXapi.cpp index 495a9b49b..989935934 100644 --- a/Source/CxbxKrnl/EmuXapi.cpp +++ b/Source/CxbxKrnl/EmuXapi.cpp @@ -1183,7 +1183,7 @@ VOID WINAPI XTL::EmuXapiThreadStartup EmuSwapFS(); // XBox FS - typedef (__stdcall *pfDummyFunc)(DWORD dwDummy); + typedef int (__stdcall *pfDummyFunc)(DWORD dwDummy); pfDummyFunc func = (pfDummyFunc)dwDummy1;