64 bits: solve various of type problems

PCSX2 · Feb 27, 2015 · 4211d51 · 4211d51
1 parent 283f523
commit 4211d51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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];