summaryrefslogtreecommitdiff
path: root/keymap.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:49:22 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:49:22 +0000
commit287ac4c6af61d8f9f95cd3b3219c979e1329a2fe (patch)
tree8e4ea351343b9404a9724600e98d417794c14c4b /keymap.c
parent262961d88faf67f69f4630acb8234a4f2c5a6e80 (diff)
Diffstat (limited to 'keymap.c')
-rw-r--r--keymap.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/keymap.c b/keymap.c
index e696e8d..a654abd 100644
--- a/keymap.c
+++ b/keymap.c
@@ -24,6 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
+/* $XFree86: xc/programs/xkbcomp/keymap.c,v 1.3 2002/07/01 02:26:01 tsi Exp $ */
#include "xkbcomp.h"
#include "tokens.h"
@@ -43,14 +44,7 @@
XkbFile * sections[MAX_SECTIONS];
Bool
-#if NeedFunctionPrototypes
CompileKeymap(XkbFile *file,XkbFileInfo *result,unsigned merge)
-#else
-CompileKeymap(file,result,merge)
- XkbFile * file;
- XkbFileInfo * result;
- unsigned merge;
-#endif
{
unsigned have;
Bool ok;