--- a/src/gui/kernel/qkeymapper_win.cpp	Wed Jun 23 19:07:03 2010 +0300
+++ b/src/gui/kernel/qkeymapper_win.cpp	Tue Jul 06 15:10:48 2010 +0300
@@ -56,7 +56,7 @@
 //#define DEBUG_KEYMAPPER
 
 // Implemented elsewhere
-extern "C" LRESULT CALLBACK QtWndProc(HWND, UINT, WPARAM, LPARAM);
+extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND, UINT, WPARAM, LPARAM);
 
 extern Q_CORE_EXPORT QLocale qt_localeFromLCID(LCID id);
 #ifndef LANG_PASHTO
@@ -619,7 +619,7 @@
     /* MAKELCID()'s first argument is a WORD, and GetKeyboardLayout()
      * returns a DWORD. */
 
-    LCID newLCID = MAKELCID((DWORD)GetKeyboardLayout(0), SORT_DEFAULT);
+    LCID newLCID = MAKELCID((quintptr)GetKeyboardLayout(0), SORT_DEFAULT);
 //    keyboardInputLocale = qt_localeFromLCID(newLCID);
 
     bool bidi = false;