From 4ab6a9846e4c43cf0c48a8a9321035623d194c47 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Mon, 16 Nov 2009 14:08:53 +0000 Subject: [PATCH] Quick fix on the last commit for Linux. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2206 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/src/x86emitter/LnxCpuDetect.cpp | 4 ++-- common/src/x86emitter/cpudetect.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/x86emitter/LnxCpuDetect.cpp b/common/src/x86emitter/LnxCpuDetect.cpp index c41a81886b..2c7d42bcf8 100644 --- a/common/src/x86emitter/LnxCpuDetect.cpp +++ b/common/src/x86emitter/LnxCpuDetect.cpp @@ -33,7 +33,7 @@ void CountLogicalCores( int LogicalCoresPerPhysicalCPU, int PhysicalCoresPerPhys const uint numCPU = sysconf( _SC_NPROCESSORS_ONLN ); if( numCPU > 0 ) { - isMultiCore = numCPU > 1; + //isMultiCore = numCPU > 1; x86caps.LogicalCores = numCPU; x86caps.PhysicalCores = ( numCPU / LogicalCoresPerPhysicalCPU ) * PhysicalCoresPerPhysicalCPU; } @@ -59,4 +59,4 @@ bool _test_instruction( void* pfnCall ) // Not implemented yet for linux (see cpudetect_internal.h for details) SingleCoreAffinity::SingleCoreAffinity() {} -SingleCoreAffinity::~SingleCoreAffinity() throw() {} \ No newline at end of file +SingleCoreAffinity::~SingleCoreAffinity() throw() {} diff --git a/common/src/x86emitter/cpudetect.cpp b/common/src/x86emitter/cpudetect.cpp index 8ac51797dd..6ed59394d6 100644 --- a/common/src/x86emitter/cpudetect.cpp +++ b/common/src/x86emitter/cpudetect.cpp @@ -26,7 +26,7 @@ __aligned16 x86CPU_INFO x86caps; # include #endif -static char* bool_to_char( bool testcond ) +static const char* bool_to_char( bool testcond ) { return testcond ? "true" : "false"; }