--- trunk/src/memory.c	2007/10/08 16:22:32	42
+++ trunk/src/memory.c	2007/10/08 16:22:56	44
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: memory.c,v 1.204 2007/06/15 17:02:38 debug Exp $
+ *  $Id: memory.c,v 1.206 2007/06/19 04:04:02 debug Exp $
  *
  *  Functions for handling the memory of an emulated machine.
  */
@@ -488,7 +488,7 @@
 
 #define MEMORY_RW	userland_memory_rw
 #define MEM_USERLAND
-#include "memory_rw.c"
+#include "cpus/memory_rw.c"
 #undef MEM_USERLAND
 #undef MEMORY_RW
 
@@ -638,7 +638,7 @@
 		debug("} ");
 	}
 
-	fatal("paddr=0x%llx >= physical_max; pc=", (long long)paddr);
+	fatal("paddr=0x%"PRIx64" >= physical_max; pc=", paddr);
 	if (cpu->is_32bit)
 		fatal("0x%08"PRIx32, (uint32_t) old_pc);
 	else