2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 62f210583ee..a3747844c65 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-24  Ken Brown  <kbrown@cornell.edu>
+
+        * w32term.c (w32_initialize): Silence compiler warning.
+
 2013-03-23  Eli Zaretskii  <eliz@gnu.org>
 
         * w32term.c (w32fullscreen_hook): Use FRAME_NORMAL_WIDTH,
diff --git a/src/w32term.c b/src/w32term.c
index 66d11164594..e02b5a61229 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6662,7 +6662,7 @@ w32_initialize (void)
   Fset_input_mode (Qnil, Qnil, make_number (2), Qnil);
 
   {
-    DWORD input_locale_id = (DWORD) GetKeyboardLayout (0);
+    DWORD input_locale_id = ((DWORD_PTR) GetKeyboardLayout (0) & 0xffffffff);
     w32_keyboard_codepage =
       codepage_for_locale ((LCID) (input_locale_id & 0xffff));
   }