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

64 bits: solve various of type problems

This commit is contained in:
3kinox 2015-02-27 22:04:15 +01:00 committed by Gregory Hainaut
parent 283f5236a5
commit 4211d51f07
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/Utilities/AlignedMalloc.cpp
View File

@ -20,7 +20,7 @@
struct AlignedMallocHeader struct AlignedMallocHeader
{ {
u32 size; // size of the allocated buffer (minus alignment and header) size_t size; // size of the allocated buffer (minus alignment and header)
void* baseptr; // offset of the original allocated pointer void* baseptr; // offset of the original allocated pointer
}; };

4
plugins/GSdx/GS.cpp
View File

@ -370,7 +370,7 @@ static int _GSopen(void** dsp, char* title, int renderer, int threads = -1)
if (s_gs->m_wnd) { if (s_gs->m_wnd) {
// A window was already attached to s_gs so we also // A window was already attached to s_gs so we also
// need to restore the window state (Attach) // need to restore the window state (Attach)
s_gs->m_wnd->Attach((void*)((uint32*)(dsp)+1), false); s_gs->m_wnd->Attach((void*)((uptr*)(dsp)+1), false);
} else { } else {
// No window found, try to attach a GLX win and retry // No window found, try to attach a GLX win and retry
// with EGL win if failed. // with EGL win if failed.
@ -379,7 +379,7 @@ static int _GSopen(void** dsp, char* title, int renderer, int threads = -1)
{ {
if (wnd[i] == NULL) continue; if (wnd[i] == NULL) continue;
wnd[i]->Attach((void*)((uint32*)(dsp)+1), false); wnd[i]->Attach((void*)((uptr*)(dsp)+1), false);
s_gs->m_wnd = wnd[i]; s_gs->m_wnd = wnd[i];
if (i == 0) delete wnd[1]; if (i == 0) delete wnd[1];