diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:48 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:48 +0000 |
| commit | ae4c01f83c60e931983c74d6285c6a22e3c33034 (patch) | |
| tree | 8e4ea351343b9404a9724600e98d417794c14c4b /keymap.c | |
| parent | 262961d88faf67f69f4630acb8234a4f2c5a6e80 (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'keymap.c')
| -rw-r--r-- | keymap.c | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -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; |