aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp/xkbpath.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 18:58:20 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 18:58:20 +0000
commite2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (patch)
treed25ddcc9b5bb33bef4832bd6e8702061a9887a53 /xkbcomp/xkbpath.h
parente445df175688f07d599649591c990d432375c67e (diff)
parentdc3c299dd0995549e2a6973ca0f25b254afd38a5 (diff)
downloadvcxsrv-e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78.tar.gz
vcxsrv-e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78.tar.bz2
vcxsrv-e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xkbcomp/xkbpath.h')
-rw-r--r--xkbcomp/xkbpath.h66
1 files changed, 26 insertions, 40 deletions
diff --git a/xkbcomp/xkbpath.h b/xkbcomp/xkbpath.h
index 75c137d0c..66c3ab76b 100644
--- a/xkbcomp/xkbpath.h
+++ b/xkbcomp/xkbpath.h
@@ -1,4 +1,3 @@
-/* $XConsortium $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,56 +23,43 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/xkbcomp/xkbpath.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */
#ifndef _XKBPATH_H_
#define _XKBPATH_H_ 1
-extern Bool XkbInitIncludePath(
- void
-);
+extern Bool XkbInitIncludePath(void);
-extern void XkbClearIncludePath(
- void
-);
+extern void XkbClearIncludePath(void);
-extern void XkbAddDefaultDirectoriesToPath(
- void
-);
+extern void XkbAddDefaultDirectoriesToPath(void);
-extern Bool XkbAddDirectoryToPath(
- const char * /* dir */
-);
+extern Bool XkbAddDirectoryToPath(const char * /* dir */
+ );
-extern char * XkbDirectoryForInclude(
- unsigned /* type */
-);
+extern char *XkbDirectoryForInclude(unsigned /* type */
+ );
-extern FILE *XkbFindFileInPath(
- char * /* name */,
- unsigned /* type */,
- char ** /* pathRtrn */
-);
+extern FILE *XkbFindFileInPath(char * /* name */ ,
+ unsigned /* type */ ,
+ char ** /* pathRtrn */
+ );
-extern void * XkbAddFileToCache(
- char * /* name */,
- unsigned /* type */,
- char * /* path */,
- void * /* data */
-);
+extern void *XkbAddFileToCache(char * /* name */ ,
+ unsigned /* type */ ,
+ char * /* path */ ,
+ void * /* data */
+ );
-extern void * XkbFindFileInCache(
- char * /* name */,
- unsigned /* type */,
- char ** /* pathRtrn */
-);
+extern void *XkbFindFileInCache(char * /* name */ ,
+ unsigned /* type */ ,
+ char ** /* pathRtrn */
+ );
-extern Bool XkbParseIncludeMap(
- char ** /* str_inout */,
- char ** /* file_rtrn */,
- char ** /* map_rtrn */,
- char * /* nextop_rtrn */,
- char ** /* extra_data */
-);
+extern Bool XkbParseIncludeMap(char ** /* str_inout */ ,
+ char ** /* file_rtrn */ ,
+ char ** /* map_rtrn */ ,
+ char * /* nextop_rtrn */ ,
+ char ** /* extra_data */
+ );
#endif /* _XKBPATH_H_ */