archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 22:11:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compilation fix

Browse source
This commit is contained in:
Nekotekina 2015-02-13 23:24:18 +03:00
parent 5fc77fe89e
commit 0d489518ab
4 changed files with 64 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Utilities/StrFmt.h
View file

@ -263,6 +263,7 @@ namespace fmt
} }
}; };
#ifdef __APPLE__
template<> template<>
struct get_fmt<unsigned long> struct get_fmt<unsigned long>
{ {
@ -286,6 +287,7 @@ namespace fmt
} }
} }
}; };
#endif
template<> template<>
struct get_fmt<u64> struct get_fmt<u64>
@ -383,6 +385,7 @@ namespace fmt
} }
}; };
#ifdef __APPLE__
template<> template<>
struct get_fmt<long> struct get_fmt<long>
{ {
@ -406,6 +409,7 @@ namespace fmt
} }
} }
}; };
#endif
template<> template<>
struct get_fmt<s64> struct get_fmt<s64>

2
Utilities/Thread.cpp
View file

@ -253,6 +253,7 @@ uint64_t* darwin_x64reg(x64_context *context, int reg)
} }
#else #else
typedef decltype(REG_RIP) reg_table_t; typedef decltype(REG_RIP) reg_table_t;
static const reg_table_t reg_table[17] = static const reg_table_t reg_table[17] =
@ -262,6 +263,7 @@ static const reg_table_t reg_table[17] =
}; };
#define X64REG(context, reg) (&context->uc_mcontext.gregs[reg_table[reg]]) #define X64REG(context, reg) (&context->uc_mcontext.gregs[reg_table[reg]])
#endif // __APPLE__ #endif // __APPLE__
#endif #endif

2
rpcs3/Emu/Cell/PPUThread.h
View file

@ -887,6 +887,7 @@ struct cast_ppu_gpr<u32, false>
} }
}; };
#ifdef __APPLE__
template<> template<>
struct cast_ppu_gpr<unsigned long, false> struct cast_ppu_gpr<unsigned long, false>
{ {
@ -900,6 +901,7 @@ struct cast_ppu_gpr<unsigned long, false>
return static_cast<unsigned long>(reg); return static_cast<unsigned long>(reg);
} }
}; };
#endif
template<> template<>
struct cast_ppu_gpr<u64, false> struct cast_ppu_gpr<u64, false>

2
rpcs3/Emu/Memory/vm.h
View file

@ -100,6 +100,7 @@ namespace vm
} }
}; };
#ifdef __APPLE__
template<> template<>
struct cast_ptr<unsigned long> struct cast_ptr<unsigned long>
{ {
@ -114,6 +115,7 @@ namespace vm
return res; return res;
} }
}; };
#endif
template<> template<>
struct cast_ptr<u32> struct cast_ptr<u32>