From 04a439a0a099893d7ea83580a8169b70c14c28db Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Sun, 16 Aug 2015 15:35:12 +0200
Subject: [PATCH] Fix function name conflict between source files

Fixes #574.
---
 src/x11_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/x11_init.c b/src/x11_init.c
index 8b7c7204..23a74e97 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -38,7 +38,7 @@
 
 // Translate an X11 key code to a GLFW key code.
 //
-static int translateKey(int scancode)
+static int translateKeyCode(int scancode)
 {
     int keySym;
 
@@ -317,7 +317,7 @@ static void createKeyTables(void)
     for (scancode = 0;  scancode < 256;  scancode++)
     {
         if (_glfw.x11.publicKeys[scancode] < 0)
-            _glfw.x11.publicKeys[scancode] = translateKey(scancode);
+            _glfw.x11.publicKeys[scancode] = translateKeyCode(scancode);
     }
 }