[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38607] branches/merwin-spacenav/intern/ ghost/intern/GHOST_SystemX11.cpp: Fix compile error due to faulty merge.

[Nathan Letwory]

Revision: 38607
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38607
Author:   jesterking
Date:     2011-07-22 14:13:28 +0000 (Fri, 22 Jul 2011)
Log Message:
-----------
Fix compile error due to faulty merge.

Modified Paths:
--------------
    branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemX11.cpp

Modified: branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemX11.cpp	2011-07-22 14:06:31 UTC (rev 38606)
+++ branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemX11.cpp	2011-07-22 14:13:28 UTC (rev 38607)
@@ -75,6 +75,9 @@
 #include <stdio.h> // for fprintf only
 #include <cstdlib> // for exit
 
+static GHOST_TKey
+convertXKey(KeySym key);
+
 //these are for copy and select copy
 static char *txt_cut_buffer= NULL;
 static char *txt_select_buffer= NULL;