ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing Windows compilation errors.

This commit is contained in:
Ben Vanik 2013-05-19 09:29:31 -07:00
parent 1ce68ca7fe
commit 7d93795c10
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenia/core/pal_win.cc
View File

@ -22,7 +22,7 @@ xe_pal_win_t* pal;
void xe_pal_dealloc(); void xe_pal_dealloc();
int xe_pal_init(xe_pal_options_t options) { int xe_pal_init(xe_pal_options_t options) {
pal = (xe_pal_win_t)xe_calloc(sizeof(pal)); pal = (xe_pal_win_t*)xe_calloc(sizeof(xe_pal_win_t));
// Get QPC timing frequency... hopefully stable over the life of the app, // Get QPC timing frequency... hopefully stable over the life of the app,
// but likely not. // but likely not.
@ -103,7 +103,7 @@ int xe_pal_get_system_info(xe_system_info* out_info) {
if (buffer[n].ProcessorCore.Flags == 1) { if (buffer[n].ProcessorCore.Flags == 1) {
// Hyper-threaded. // Hyper-threaded.
// The number of processors is set as bits in ProcessorMask. // The number of processors is set as bits in ProcessorMask.
out_info.processors.logical_count += out_info->processors.logical_count +=
CountSetBits(buffer[n].ProcessorMask); CountSetBits(buffer[n].ProcessorMask);
} else { } else {
// A real core - just count as one. // A real core - just count as one.

2
src/xenia/core/path_win.cc
View File

@ -12,4 +12,6 @@
const xechar_t* xe_path_get_tmp(const xechar_t* prefix) { const xechar_t* xe_path_get_tmp(const xechar_t* prefix) {
// //
XEASSERTALWAYS();
return NULL;
} }

1
src/xenia/platform_includes.h
View File

@ -19,6 +19,7 @@
#endif #endif
#include <SDKDDKVer.h> #include <SDKDDKVer.h>
#include <windows.h> #include <windows.h>
#include <ObjBase.h>
#undef min #undef min
#undef max #undef max
#endif // WINCE || WIN32 #endif // WINCE || WIN32