From d114d698a2a27fe26ad6da4e9512d5273753a1ee Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Sat, 7 Nov 2009 17:15:37 +0000 Subject: [PATCH] svnrev.h fixes for when TortoiseSVN isn't available (fixes compilation errors in SPU2-X and cdvdGigaherz). git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2149 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/include/x86emitter/internal.h | 7 +++++++ common/src/x86emitter/x86emitter.cpp | 6 ------ common/vsprops/svnrev_unknown.h | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/common/include/x86emitter/internal.h b/common/include/x86emitter/internal.h index 82364ccc50..b4727261df 100644 --- a/common/include/x86emitter/internal.h +++ b/common/include/x86emitter/internal.h @@ -33,6 +33,13 @@ extern void EmitSibMagic( const xRegisterBase& reg1, const ModSibBase& sib ); extern void _xMovRtoR( const xRegisterInt& to, const xRegisterInt& from ); extern void _g1_EmitOp( G1Type InstType, const xRegisterInt& to, const xRegisterInt& from ); +template< typename T > inline +void xWrite( T val ) +{ + *(T*)x86Ptr = val; + x86Ptr += sizeof(T); +} + template< typename T1, typename T2 > __emitinline void xOpWrite( u8 prefix, u8 opcode, const T1& param1, const T2& param2 ) { diff --git a/common/src/x86emitter/x86emitter.cpp b/common/src/x86emitter/x86emitter.cpp index 9d9891e255..f540415b49 100644 --- a/common/src/x86emitter/x86emitter.cpp +++ b/common/src/x86emitter/x86emitter.cpp @@ -70,12 +70,6 @@ __threadlocal XMMSSEType g_xmmtypes[iREGCNT_XMM] = { XMMT_INT }; namespace x86Emitter { -template< typename T > void xWrite( T val ) -{ - *(T*)x86Ptr = val; - x86Ptr += sizeof(T); -} - template void xWrite( u8 val ); template void xWrite( u16 val ); template void xWrite( u32 val ); diff --git a/common/vsprops/svnrev_unknown.h b/common/vsprops/svnrev_unknown.h index 4872e23b20..4648435ca3 100644 --- a/common/vsprops/svnrev_unknown.h +++ b/common/vsprops/svnrev_unknown.h @@ -20,4 +20,5 @@ // doesn't check for the SVN_REV_UNKNOWN define. #define SVN_REV 0 -#define SVN_MODS "" \ No newline at end of file +#define SVN_MODS 0 +