From 73236652789e5e0349aa3561baa4cbf7088b57e9 Mon Sep 17 00:00:00 2001
From: evilynux <evilynux@users.sf.net>
Date: Sun, 14 Jan 2007 22:28:39 +0000
Subject: [PATCH] Replaced two types with our ones we've defined.

---
 desmume/src/ctrlssdl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/desmume/src/ctrlssdl.c b/desmume/src/ctrlssdl.c
index 2c4376234..a4db265bc 100644
--- a/desmume/src/ctrlssdl.c
+++ b/desmume/src/ctrlssdl.c
@@ -119,9 +119,9 @@ void update_keypad(u16 keys)
 u16 get_keypad()
 {
   u16 keypad;
-  keypad = ~((unsigned short *)MMU.ARM7_REG)[0x130>>1];
+  keypad = ~((u16 *)MMU.ARM7_REG)[0x130>>1];
   keypad = (keypad & 0x3) << 10;
-  keypad |= ~((unsigned short *)ARM9Mem.ARM9_REG)[0x130>>1] & 0x3FF;
+  keypad |= ~((u16 *)ARM9Mem.ARM9_REG)[0x130>>1] & 0x3FF;
   return keypad;
 }