Fix long->sqIntptr_t forgotten in platforms/win32/vm

OpenSmalltalk · Jul 18, 2016 · f0af02e · f0af02e
1 parent 7d278c0
commit f0af02e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/platforms/win32/vm/sqWin32Alloc.c b/platforms/win32/vm/sqWin32Alloc.c
@@ -176,7 +176,7 @@ int sqMemoryExtraBytesLeft(int includingSwap) {
 
 # if COGVM
 void
-sqMakeMemoryExecutableFromTo(unsigned long startAddr, unsigned long endAddr)
+sqMakeMemoryExecutableFromTo(usqIntptr_t startAddr, usqIntptr_t endAddr)
 {
 	DWORD previous;
 
@@ -188,7 +188,7 @@ sqMakeMemoryExecutableFromTo(unsigned long startAddr, unsigned long endAddr)
 }
 
 void
-sqMakeMemoryNotExecutableFromTo(unsigned long startAddr, unsigned long endAddr)
+sqMakeMemoryNotExecutableFromTo(usqIntptr_t startAddr, usqIntptr_t endAddr)
 {
 	DWORD previous;
 

diff --git a/platforms/win32/vm/sqWin32Main.c b/platforms/win32/vm/sqWin32Main.c
@@ -2029,9 +2029,9 @@ parseArguments(int argc, char *argv[])
 int
 isCFramePointerInUse()
 {
-	extern unsigned long CStackPointer, CFramePointer;
+	extern usqIntptr_t CStackPointer, CFramePointer;
 	extern void (*ceCaptureCStackPointers)(void);
-	unsigned long currentCSP = CStackPointer;
+	usqIntptr_t currentCSP = CStackPointer;
 
 	currentCSP = CStackPointer;
 	ceCaptureCStackPointers();

diff --git a/platforms/win32/vm/sqWin32SpurAlloc.c b/platforms/win32/vm/sqWin32SpurAlloc.c
@@ -44,7 +44,7 @@ void *
 sqAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize)
 {
 	char *hint, *address, *alloc;
-	unsigned long alignment;
+	usqIntptr_t alignment;
 	sqInt allocBytes;
 	SYSTEM_INFO sysInfo;
 
@@ -105,7 +105,7 @@ sqAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize)
 #define SizeForRelease(bytes) 0
 
 static int
-address_space_used(char *address, unsigned long bytes)
+address_space_used(char *address, usqInt bytes)
 {
 	MEMORY_BASIC_INFORMATION info;
 	int addressSpaceUnused;
@@ -128,7 +128,7 @@ void *
 sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(sqInt size, void *minAddress, sqInt *allocatedSizePointer)
 {
 	char *address, *alloc;
-	long bytes, delta;
+	usqInt bytes, delta;
 
 	address = (char *)roundUpToPage((usqIntptr_t)minAddress);
 	bytes = roundUpToPage(size);