From 452889aad6eca008ccba92e98eb8139dccea94d8 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon, 17 Nov 2003 19:03:42 +0000
Subject: merge XFree86 4.3.0.1 to -CURRENT

---
 src/cout.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/cout.c')

diff --git a/src/cout.c b/src/cout.c
index 4d7c147..f8deed2 100644
--- a/src/cout.c
+++ b/src/cout.c
@@ -24,12 +24,11 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
+ /* $XFree86: xc/lib/xkbfile/cout.c,v 3.8 2003/02/03 20:12:00 paulo Exp $ */
 
 #include <stdio.h>
 #include <ctype.h>
-#ifndef X_NOT_STDC_ENV
 #include <stdlib.h>
-#endif
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
@@ -364,8 +363,8 @@ register unsigned i;
 	    if (i==0)		fprintf(file,"    ");
 	    else if ((i&3)==0)	fprintf(file,",\n    ");
 	    else			fprintf(file,", ");
-	    fprintf(file,"{ %2d, 0x%x, %3d }",map->kt_index,map->group_info,
-							 map->offset);
+	    fprintf(file, "{ %2d, 0x%x, %3d }",
+		    map->kt_index[0], map->group_info, map->offset);
 	}
 	fprintf(file,"\n};\n");
     }
@@ -496,17 +495,18 @@ XkbIndicatorMapPtr	imap;
 
     if (xkb->indicators==NULL)
 	return True;
-    fprintf(file,"static XkbIndicatorRec indicators= {\n");
-    fprintf(file,"    0x%x,\n    {\n",xkb->indicators->phys_indicators);
+    fprintf(file, "static XkbIndicatorRec indicators= {\n");
+    fprintf(file, "    0x%lx,\n    {\n",
+	    (long)xkb->indicators->phys_indicators);
     for (imap=xkb->indicators->maps,i=nNames=0;i<XkbNumIndicators;i++,imap++) {
-	fprintf(file,"%s        { 0x%02x, %s, 0x%02x, %s, %s, ",
+	fprintf(file,"%s        { 0x%02x, %s, 0x%02x, %s, { %s, ",
 			(i!=0?",\n":""),
 			imap->flags,
 			XkbIMWhichStateMaskText(imap->which_groups,XkbCFile),
 			imap->groups,
 			XkbIMWhichStateMaskText(imap->which_mods,XkbCFile),
 			XkbModMaskText(imap->mods.mask,XkbCFile));
-	fprintf(file," %s, %s, %s }",
+	fprintf(file," %s, %s }, %s }",
 			XkbModMaskText(imap->mods.real_mods,XkbCFile),
 			XkbVModMaskText(dpy,xkb,0,imap->mods.vmods,XkbCFile),
 			XkbControlsMaskText(imap->ctrls,XkbCFile));
@@ -1208,7 +1208,7 @@ Bool			(*func)(
 	if (tmp==NULL)
 	     tmp= name;
 	else tmp++;
-	hdrdef= (char *)_XkbCalloc(strlen(tmp+1),sizeof(char));
+	hdrdef= (char *)_XkbCalloc(strlen(tmp)+1,sizeof(char));
 	if (hdrdef) {
 	    strcpy(hdrdef,tmp);
 	    tmp= hdrdef;
-- 
cgit v1.2.3