diff --git a/main-loop.c b/main-loop.c
index e8d40ce..c66c162 100644
--- a/main-loop.c
+++ b/main-loop.c
@@ -64,7 +64,7 @@
 
 static void qemu_event_read(void *opaque)
 {
-    int fd = (unsigned long)opaque;
+    int fd = (int)(intptr_t)opaque;
     ssize_t len;
 
     /* Drain the notify pipe */
@@ -92,7 +92,7 @@
         goto fail;
 
     qemu_set_fd_handler2(fds[0], NULL, qemu_event_read, NULL,
-                         (void *)(unsigned long)fds[0]);
+                         (void *)(intptr_t)fds[0]);
 
     io_thread_fd = fds[1];
     return 0;
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index ccce17f..2c065cf 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -2247,7 +2247,7 @@
  * The following functions are address translation helper functions
  * for fast memory access in QEMU.
  */
-static unsigned long v2p_mmu(CPUMIPSState *env, target_ulong addr, int is_user)
+static uintptr_t v2p_mmu(CPUMIPSState *env, target_ulong addr, int is_user)
 {
     int index;
     target_ulong tlb_addr;
@@ -2273,7 +2273,7 @@
  * to the address of simulation host (not the physical
  * address of simulated OS.
  */
-unsigned long v2p(target_ulong ptr, int is_user)
+uintptr_t v2p(target_ulong ptr, int is_user)
 {
     CPUMIPSState *env;
     int index;