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 /xkbpath.h | |
| parent | 262961d88faf67f69f4630acb8234a4f2c5a6e80 (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'xkbpath.h')
| -rw-r--r-- | xkbpath.h | 24 |
1 files changed, 7 insertions, 17 deletions
@@ -24,66 +24,56 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86: xc/programs/xkbcomp/xkbpath.h,v 1.4 2002/11/15 03:14:12 dawes Exp $ */ #ifndef _XKBPATH_H_ #define _XKBPATH_H_ 1 extern Bool XkbInitIncludePath( -#if NeedFunctionPrototypes void -#endif ); extern void XkbClearIncludePath( -#if NeedFunctionPrototypes void -#endif +); + +extern void XkbAddDefaultDirectoriesToPath( + void ); extern Bool XkbAddDirectoryToPath( -#if NeedFunctionPrototypes char * /* dir */ -#endif ); extern char * XkbDirectoryForInclude( -#if NeedFunctionPrototypes unsigned /* type */ -#endif ); extern FILE *XkbFindFileInPath( -#if NeedFunctionPrototypes char * /* name */, unsigned /* type */, char ** /* pathRtrn */ -#endif ); extern void * XkbAddFileToCache( -#if NeedFunctionPrototypes char * /* name */, unsigned /* type */, char * /* path */, void * /* data */ -#endif ); extern void * XkbFindFileInCache( -#if NeedFunctionPrototypes char * /* name */, unsigned /* type */, char ** /* pathRtrn */ -#endif ); extern Bool XkbParseIncludeMap( -#if NeedFunctionPrototypes char ** /* str_inout */, char ** /* file_rtrn */, char ** /* map_rtrn */, - char * /* nextop_rtrn */ -#endif + char * /* nextop_rtrn */, + char ** /* extra_data */ ); #endif /* _XKBPATH_H_ */ |