From 4211d51f0709facbfbf5d7c9deda7d01ab345bb1 Mon Sep 17 00:00:00 2001 From: 3kinox Date: Fri, 27 Feb 2015 22:04:15 +0100 Subject: [PATCH] 64 bits: solve various of type problems --- common/src/Utilities/AlignedMalloc.cpp | 2 +- plugins/GSdx/GS.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/Utilities/AlignedMalloc.cpp b/common/src/Utilities/AlignedMalloc.cpp index 285317b2e0..45d218a876 100644 --- a/common/src/Utilities/AlignedMalloc.cpp +++ b/common/src/Utilities/AlignedMalloc.cpp @@ -20,7 +20,7 @@ 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 }; diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp index 3ffb5e8a77..7cca083196 100644 --- a/plugins/GSdx/GS.cpp +++ b/plugins/GSdx/GS.cpp @@ -370,7 +370,7 @@ static int _GSopen(void** dsp, char* title, int renderer, int threads = -1) if (s_gs->m_wnd) { // A window was already attached to s_gs so we also // 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 { // No window found, try to attach a GLX win and retry // 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; - wnd[i]->Attach((void*)((uint32*)(dsp)+1), false); + wnd[i]->Attach((void*)((uptr*)(dsp)+1), false); s_gs->m_wnd = wnd[i]; if (i == 0) delete wnd[1];