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 /alias.h | |
| parent | 262961d88faf67f69f4630acb8234a4f2c5a6e80 (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'alias.h')
| -rw-r--r-- | alias.h | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -24,6 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86: xc/programs/xkbcomp/alias.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */ #ifndef ALIAS_H #define ALIAS_H 1 @@ -35,34 +36,26 @@ typedef struct _AliasInfo { } AliasInfo; extern int HandleAliasDef( -#if NeedFunctionPrototypes KeyAliasDef * /* def */, unsigned /* merge */, unsigned /* file_id */, AliasInfo ** /* info */ -#endif ); extern void ClearAliases( -#if NeedFunctionPrototypes AliasInfo ** /* info */ -#endif ); extern Bool MergeAliases( -#if NeedFunctionPrototypes AliasInfo ** /* into */, AliasInfo ** /* merge */, unsigned /* how_merge */ -#endif ); extern int ApplyAliases( -#if NeedFunctionPrototypes XkbDescPtr /* xkb */, Bool /* toGeom */, AliasInfo ** /* info */ -#endif ); #endif /* ALIAS_H */ |