From 50eee913b8c6ae364bbe0b59872078d372352fd1 Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Sat, 18 Dec 2004 22:20:27 +0000
Subject: [PATCH] s/vm_page_size/vm_get_page_size/ to avoid name clash on MacOS
 X

---
 BasiliskII/src/Unix/video_vosf.h | 4 ++--
 BasiliskII/src/Unix/vm_alloc.cpp | 4 ++--
 BasiliskII/src/Unix/vm_alloc.h   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/BasiliskII/src/Unix/video_vosf.h b/BasiliskII/src/Unix/video_vosf.h
index 4cd84b9a..5987168d 100644
--- a/BasiliskII/src/Unix/video_vosf.h
+++ b/BasiliskII/src/Unix/video_vosf.h
@@ -184,7 +184,7 @@ static int log_base_2(uint32 x)
 // Extend size to page boundary
 static uint32 page_extend(uint32 size)
 {
-	const uint32 page_size = vm_page_size();
+	const uint32 page_size = vm_get_page_size();
 	const uint32 page_mask = page_size - 1;
 	return (size + page_mask) & ~page_mask;
 }
@@ -232,7 +232,7 @@ static bool video_vosf_init(MONITOR_INIT)
 {
 	VIDEO_MODE_INIT_MONITOR;
 
-	const uintptr page_size = vm_page_size();
+	const uintptr page_size = vm_get_page_size();
 	const uintptr page_mask = page_size - 1;
 	
 	// Round up frame buffer base to page boundary
diff --git a/BasiliskII/src/Unix/vm_alloc.cpp b/BasiliskII/src/Unix/vm_alloc.cpp
index f96c85d4..a0e6112e 100644
--- a/BasiliskII/src/Unix/vm_alloc.cpp
+++ b/BasiliskII/src/Unix/vm_alloc.cpp
@@ -451,7 +451,7 @@ int vm_protect(void * addr, size_t size, int prot)
 
 /* Returns the size of a page.  */
 
-int vm_page_size(void)
+int vm_get_page_size(void)
 {
 #ifdef _WIN32
     return 4096;
@@ -470,7 +470,7 @@ int main(void)
 	vm_init();
 	
 #define page_align(address) ((char *)((unsigned long)(address) & -page_size))
-	unsigned long page_size = vm_page_size();
+	unsigned long page_size = vm_get_page_size();
 	
 	const int area_size = 6 * page_size;
 	volatile char * area = (volatile char *) vm_acquire(area_size);
diff --git a/BasiliskII/src/Unix/vm_alloc.h b/BasiliskII/src/Unix/vm_alloc.h
index 0d7a9bd1..29d22178 100644
--- a/BasiliskII/src/Unix/vm_alloc.h
+++ b/BasiliskII/src/Unix/vm_alloc.h
@@ -111,6 +111,6 @@ extern int vm_protect(void * addr, size_t size, int prot);
 
 /* Returns the size of a page.  */
 
-extern int vm_page_size(void);
+extern int vm_get_page_size(void);
 
 #endif /* VM_ALLOC_H */