pulling in some simple code fixes suggested towards XCode 4.2 support

This commit is contained in:
Timothee 'TTimo' Besset
2011-12-10 18:27:30 -06:00
parent f1f80640fb
commit 7db8be7917
7 changed files with 11 additions and 13 deletions

View File

@@ -43,7 +43,7 @@ If you have questions concerning this license or the applicable additional terms
#import "macosx_sys.h"
#import <fenv.h>
#import <ucontext.h>
#import <sys/ucontext.h>
#import <mach/thread_status.h>
#define MAX_KEYS 256
@@ -467,13 +467,13 @@ Sys_GetProcessorId
===============
*/
cpuid_t Sys_GetProcessorId( void ) {
cpuid_t cpuid = CPUID_GENERIC;
int cpuid = CPUID_GENERIC;
#if defined(__ppc__)
cpuid |= CPUID_ALTIVEC;
#elif defined(__i386__)
cpuid |= CPUID_INTEL | CPUID_MMX | CPUID_SSE | CPUID_SSE2 | CPUID_SSE3 | CPUID_HTT | CPUID_CMOV | CPUID_FTZ | CPUID_DAZ;
#endif
return cpuid;
return static_cast<cpuid_t>(cpuid);
}
/*