From 2200a799795ef755268b5c205147b0af4fcc014e Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Fri, 25 Jun 2010 15:26:51 +0000 Subject: [PATCH] Re-re-re-fix linux/gcc >_< (all that was actually missing was a 'struct' keyword .. grr msvc being smart and auto-deducing the type for me) git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3304 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/include/Utilities/FixedPointTypes.h | 4 ---- common/src/Utilities/IniInterface.cpp | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/common/include/Utilities/FixedPointTypes.h b/common/include/Utilities/FixedPointTypes.h index 9001cbac68..71c4519112 100644 --- a/common/include/Utilities/FixedPointTypes.h +++ b/common/include/Utilities/FixedPointTypes.h @@ -74,7 +74,3 @@ struct FixedInt typedef FixedInt<256> Fixed256; typedef FixedInt<100> Fixed100; - -#ifdef __LINUX__ -#include "FixedPointTypes.inl" -#endif diff --git a/common/src/Utilities/IniInterface.cpp b/common/src/Utilities/IniInterface.cpp index 3f5121289b..03a6154983 100644 --- a/common/src/Utilities/IniInterface.cpp +++ b/common/src/Utilities/IniInterface.cpp @@ -23,10 +23,8 @@ const wxRect wxDefaultRect( wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDe // Implement FixedPointTypes (for lack of a better location, for now) #include "FixedPointTypes.inl" -#ifndef __LINUX__ -template FixedInt<100>; -template FixedInt<256>; -#endif +template struct FixedInt<100>; +template struct FixedInt<256>; static int _calcEnumLength( const wxChar* const* enumArray ) {