From c018ef6b6b0d2d0bdb2673298c42ef8421137180 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Fri, 16 Aug 2002 01:34:19 +0000
Subject: [PATCH] Convert HKL to a void*.

---
 include/windef.h | 2 +-
 windows/input.c  | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/include/windef.h b/include/windef.h
index 731781579f3..361119fee1b 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -83,7 +83,7 @@ DECLARE_HANDLE(HHOOK);
 DECLARE_OLD_HANDLE(HICON);
 DECLARE_OLD_HANDLE(HINSTANCE);
 DECLARE_OLD_HANDLE(HKEY);
-DECLARE_OLD_HANDLE(HKL);
+DECLARE_HANDLE(HKL);
 DECLARE_OLD_HANDLE(HMENU);
 DECLARE_HANDLE(HMETAFILE);
 DECLARE_HANDLE(HMONITOR);
diff --git a/windows/input.c b/windows/input.c
index 3b0dd958b22..b4af406dec6 100644
--- a/windows/input.c
+++ b/windows/input.c
@@ -774,11 +774,11 @@ INT16 WINAPI GetKeyboardLayoutName16(LPSTR pwszKLID)
  */
 HKL WINAPI GetKeyboardLayout(DWORD dwLayout)
 {
-        HKL layout;
+        UINT layout;
         layout = GetSystemDefaultLCID(); /* FIXME */
         layout |= (layout<<16);          /* FIXME */
         TRACE_(keyboard)("returning %08x\n",layout);
-        return layout;
+        return (HKL)layout;
 }
 
 /****************************************************************************
@@ -1184,6 +1184,3 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme)
 
     return TRUE;
 }
-
-
-