From b7624aa49adffb7dcba3d190613e6097c8503e45 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Thu, 16 Apr 2015 06:20:46 -0400
Subject: [PATCH] uintptr_t is pointless when usize is the same anyway

---
 src/arch/x86_64/mod.rs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/arch/x86_64/mod.rs b/src/arch/x86_64/mod.rs
index 68867d0..301e050 100644
--- a/src/arch/x86_64/mod.rs
+++ b/src/arch/x86_64/mod.rs
@@ -7,20 +7,17 @@ use core::ptr;
 
 use stack::Stack;
 
-#[allow(non_camel_case_types)]
-pub type uintptr_t = u64;
-
 #[allow(raw_pointer_derive)]
 #[derive(Copy, Clone)]
 pub struct Registers {
-  rsp: *mut uintptr_t
+  rsp: *mut usize
 }
 
 impl Registers {
   #[inline]
   pub unsafe fn new<S, F>(stack: &mut S, f: F) -> Registers where S: Stack, F: FnOnce() {
     let sp_limit = stack.limit();
-    let mut sp = stack.top() as *mut uintptr_t;
+    let mut sp = stack.top() as *mut usize;
     let f_ptr = push(&mut sp, f);
 
     asm!(include_str!("init.s")
@@ -55,12 +52,12 @@ unsafe extern "C" fn rust_trampoline<F: FnOnce()>(f: *const F) {
   ptr::read(f)()
 }
 
-unsafe fn push<T>(spp: &mut *mut uintptr_t, value: T) -> *mut T {
+unsafe fn push<T>(spp: &mut *mut usize, value: T) -> *mut T {
   let mut sp = *spp as *mut T;
   sp = offset_mut(sp, -1);
   sp = align_down_mut(sp, max(align_of::<T>(), 16));
   *sp = value;
-  *spp = sp as *mut uintptr_t;
+  *spp = sp as *mut usize;
   sp
 }