Build fix on Linux 64 bits with GCC 4.8.

ui/events/keycodes/keyboard_code_conversion_x.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 
 #include <algorithm>
 
 #define XK_3270  // for XK_3270_BackTab
 #include <X11/XF86keysym.h>
@@ skipping 37 matching lines @@
 // e.g. in UK keyboard, the key between Quote and Enter keys has the VKEY code
 // VKEY_OEM_5 instead of VKEY_3.
 //
 // The key symbols which are not [a-zA-Z0-9] and functional/extend keys (e.g.
 // TAB, ENTER, BS, Arrow keys, modifier keys, F1-F12, media/app keys, etc.)
 // should go through these maps for correct VKEY codes.
 //
 // Please refer to crbug.com/386066.
 //
 const struct MAP0 {
-  uint16 ch0;
+  KeySym ch0;
   uint8 vk;
   bool operator()(const MAP0& m1, const MAP0& m2) const {
     return m1.ch0 < m2.ch0;
   }
 } map0[] = {
       {0x0025, 0x35},  // XK_percent: VKEY_5
       {0x0026, 0x31},  // XK_ampersand: VKEY_1
       {0x003C, 0xDC},  // XK_less: VKEY_OEM_5
       {0x007B, 0xDE},  // XK_braceleft: VKEY_OEM_7
       {0x007C, 0xDC},  // XK_bar: VKEY_OEM_5
@@ skipping 39 matching lines @@
       {0x02F5, 0xDB},  // XK_gabovedot: VKEY_OEM_4
       {0x03B6, 0xBF},  // XK_lcedilla: VKEY_OEM_2
       {0x03BA, 0x57},  // XK_emacron: VKEY_W
       {0x03E0, 0xDF},  // XK_amacron: VKEY_OEM_8
       {0x03EF, 0xDD},  // XK_imacron: VKEY_OEM_6
       {0x03F1, 0xDB},  // XK_ncedilla: VKEY_OEM_4
       {0x03F3, 0xDC},  // XK_kcedilla: VKEY_OEM_5
 };
 
 const struct MAP1 {
-  uint16 ch0;
-  uint8 sc;
+  KeySym ch0;
+  unsigned sc;
   uint8 vk;
   bool operator()(const MAP1& m1, const MAP1& m2) const {
     if (m1.ch0 == m2.ch0)
       return m1.sc < m2.sc;
     return m1.ch0 < m2.ch0;
   }
 } map1[] = {
       {0x0021, 0x0A, 0x31},  // XK_exclam+AE01: VKEY_1
       {0x0021, 0x11, 0x38},  // XK_exclam+AE08: VKEY_8
       {0x0021, 0x3D, 0xDF},  // XK_exclam+AB10: VKEY_OEM_8
@@ skipping 163 matching lines @@
       {0x03E7, 0x0E, 0x35},  // XK_iogonek+AE05: VKEY_5
       {0x03EC, 0x0D, 0x34},  // XK_eabovedot+AE04: VKEY_4
       {0x03EC, 0x30, 0xDE},  // XK_eabovedot+AC11: VKEY_OEM_7
       {0x03F9, 0x10, 0x37},  // XK_uogonek+AE07: VKEY_7
       {0x03FE, 0x11, 0x38},  // XK_umacron+AE08: VKEY_8
       {0x03FE, 0x18, 0x51},  // XK_umacron+AD01: VKEY_Q
       {0x03FE, 0x35, 0x58},  // XK_umacron+AB02: VKEY_X
 };
 
 const struct MAP2 {
-  uint16 ch0;
-  uint8 sc;
-  uint16 ch1;
+  KeySym ch0;
+  unsigned sc;
+  KeySym ch1;
   uint8 vk;
   bool operator()(const MAP2& m1, const MAP2& m2) const {
     if (m1.ch0 == m2.ch0 && m1.sc == m2.sc)
       return m1.ch1 < m2.ch1;
     if (m1.ch0 == m2.ch0)
       return m1.sc < m2.sc;
     return m1.ch0 < m2.ch0;
   }
 } map2[] = {
       {0x0023, 0x33, 0x0027,
@@ skipping 21 matching lines @@
       {0x00E0, 0x30, 0x00B0, 0xDE},  // XK_agrave+AC11+XK_degree: VKEY_OEM_7
       {0x00E0, 0x30, 0x00E4, 0xDC},  // XK_agrave+AC11+XK_adiaeresis: VKEY_OEM_5
       {0x00E4, 0x30, 0x00E0, 0xDC},  // XK_adiaeresis+AC11+XK_agrave: VKEY_OEM_5
       {0x00E9, 0x2F, 0x00C9, 0xBA},  // XK_eacute+AC10+XK_Eacute: VKEY_OEM_1
       {0x00E9, 0x2F, 0x00F6, 0xDE},  // XK_eacute+AC10+XK_odiaeresis: VKEY_OEM_7
       {0x00F6, 0x2F, 0x00E9, 0xDE},  // XK_odiaeresis+AC10+XK_eacute: VKEY_OEM_7
       {0x00FC, 0x22, 0x00E8, 0xBA},  // XK_udiaeresis+AD11+XK_egrave: VKEY_OEM_1
 };
 
 const struct MAP3 {
-  uint16 ch0;
-  uint8 sc;
-  uint16 ch1;
-  uint16 ch2;
+  KeySym ch0;
+  unsigned sc;
+  KeySym ch1;
+  KeySym ch2;
   uint8 vk;
   bool operator()(const MAP3& m1, const MAP3& m2) const {
     if (m1.ch0 == m2.ch0 && m1.sc == m2.sc && m1.ch1 == m2.ch1)
       return m1.ch2 < m2.ch2;
     if (m1.ch0 == m2.ch0 && m1.sc == m2.sc)
       return m1.ch1 < m2.ch1;
     if (m1.ch0 == m2.ch0)
       return m1.sc < m2.sc;
     return m1.ch0 < m2.ch0;
   }
@@ skipping 986 matching lines @@
   // alone does not map to XK_less; XKeysymToKeycode() returns KEY_102ND
   // (the '<>' key between Shift and Z on 105-key keyboards) which does.
   //
   // crbug.com/386066 and crbug.com/390263 are examples of problems
   // associated with this.
   //
   return XKeysymToKeycode(display, XKeysymForWindowsKeyCode(key_code, false));
 }
 
 }  // namespace ui