Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 126 insertions, 0 deletions

diff --git a/xkbcomp/misc.h b/xkbcomp/misc.h
new file mode 100644
index 000000000..fd16db482
--- /dev/null
+++ b/xkbcomp/misc.h
@@ -0,0 +1,126 @@
+/* $Xorg: misc.h,v 1.3 2000/08/17 19:54:33 cpqbld Exp $ */
+/************************************************************
+ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
+
+ Permission to use, copy, modify, and distribute this
+ software and its documentation for any purpose and without
+ fee is hereby granted, provided that the above copyright
+ notice appear in all copies and that both that copyright
+ notice and this permission notice appear in supporting
+ documentation, and that the name of Silicon Graphics not be 
+ used in advertising or publicity pertaining to distribution 
+ of the software without specific prior written permission.
+ Silicon Graphics makes no representation about the suitability 
+ of this software for any purpose. It is provided "as is"
+ without any express or implied warranty.
+ 
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+ AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+ THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ ********************************************************/
+/* $XFree86$ */
+
+#ifndef MISC_H
+#define MISC_H 1
+
+typedef	struct	_CommonInfo {
+    unsigned short		defined;
+    unsigned char		fileID;
+    unsigned char		merge;
+    struct _CommonInfo *	next;
+} CommonInfo;
+
+extern Bool	UseNewField(
+    unsigned		/* field */,
+    CommonInfo * 	/* oldDefs */,
+    CommonInfo *	/* newDefs */,
+    unsigned *		/* pCollide */
+);
+
+extern Bool	MergeNewField(
+    unsigned		/* field */,
+    CommonInfo * 	/* oldDefs */,
+    CommonInfo *	/* newDefs */,
+    unsigned *		/* pCollide */
+);
+
+extern XPointer ClearCommonInfo(
+    CommonInfo *	/* cmn */
+);
+
+extern XPointer AddCommonInfo(
+    CommonInfo *	/* old */,
+    CommonInfo *	/* new */
+);
+
+extern int	ReportNotArray(
+    const char * /* type */,
+    const char * /* field */,
+    const char * /* name */
+);
+
+extern int	ReportShouldBeArray(
+    const char * /* type */,
+    const char * /* field */,
+    char *	/* name */
+);
+
+extern int	ReportBadType(
+    const char * /* type */,
+    const char * /* field */,
+    const char * /* name */,
+    const char * /* wanted */
+);
+
+extern int	ReportBadIndexType(
+    char *	/* type */,
+    char *	/* field */,
+    char *	/* name */,
+    char *	/* wanted */
+);
+
+extern int	ReportBadField(
+    const char * /* type */,
+    const char * /* field */,
+    const char * /* name */
+);
+
+extern int	ReportMultipleDefs(
+    char *	/* type */,
+    char *	/* field */,
+    char *	/* which */
+);
+
+extern Bool	ProcessIncludeFile(
+    IncludeStmt	*	/* stmt */,
+    unsigned		/* file_type */,
+    XkbFile **		/* file_rtrn */,
+    unsigned *		/* merge_rtrn */
+);
+
+extern Status	ComputeKbdDefaults(
+    XkbDescPtr		/* xkb */
+);
+
+extern Bool FindNamedKey(
+    XkbDescPtr		/* xkb */,
+    unsigned long	/* name */,
+    unsigned int *	/* kc_rtrn */,
+    Bool		/* use_aliases */,
+    Bool		/* create */,
+    int			/* start_from */
+);
+
+extern Bool FindKeyNameForAlias(
+    XkbDescPtr		/* xkb */,
+    unsigned long	/* lname */,
+    unsigned long *	/* real_name */
+);
+
+#endif /* MISC_H */