--- np2/i386c/ia32/cpu_mem.h	2008/03/22 04:03:07	1.11
+++ np2/i386c/ia32/cpu_mem.h	2011/12/29 13:32:12	1.13
@@ -1,5 +1,3 @@
-/*	$Id: cpu_mem.h,v 1.11 2008/03/22 04:03:07 monaka Exp $	*/
-
 /*
  * Copyright (c) 2002-2004 NONAKA Kimihiro
  * All rights reserved.
@@ -58,9 +56,9 @@ UINT16 MEMCALL cpu_vmemoryread_w(int idx
 UINT32 MEMCALL cpu_vmemoryread_d(int idx, UINT32 offset);
 UINT64 MEMCALL cpu_vmemoryread_q(int idx, UINT32 offset);
 REG80 MEMCALL cpu_vmemoryread_f(int idx, UINT32 offset);
-UINT32 MEMCALL cpu_memory_access_va_RMW_b(int idx, UINT32 offset, UINT32 (*func)(UINT32, void *), void *arg);
-UINT32 MEMCALL cpu_memory_access_va_RMW_w(int idx, UINT32 offset, UINT32 (*func)(UINT32, void *), void *arg);
-UINT32 MEMCALL cpu_memory_access_va_RMW_d(int idx, UINT32 offset, UINT32 (*func)(UINT32, void *), void *arg);
+UINT32 MEMCALL cpu_memory_access_va_RMW_b(int idx, UINT32 offset, UINT32 (CPUCALL *func)(UINT32, void *), void *arg);
+UINT32 MEMCALL cpu_memory_access_va_RMW_w(int idx, UINT32 offset, UINT32 (CPUCALL *func)(UINT32, void *), void *arg);
+UINT32 MEMCALL cpu_memory_access_va_RMW_d(int idx, UINT32 offset, UINT32 (CPUCALL *func)(UINT32, void *), void *arg);
 #define	cpu_vmemorywrite(i,o,v)			cpu_vmemorywrite_b(i,o,v)
 #define	cpu_vmemoryread(i,o)			cpu_vmemoryread_b(i,o)
 #define	cpu_memory_access_va_RMW(i,o,f,a)	cpu_memory_access_va_RMW_b(i,o,f,a)