diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-14 16:48:50 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-14 16:48:50 +0000 |
| commit | cb45b671537b25c832428c0a75cb7d7712dea3e5 (patch) | |
| tree | 980bdede3bf8457796988d83b410321d6af21b69 /src/xkmout.c | |
| parent | 52a8406aaba4ed1f9fa5e78bfa5da7af659bce01 (diff) | |
XFree86 4.3.0.1xf86-4_3_0_1PRE_xf86-4_3_0_1
Diffstat (limited to 'src/xkmout.c')
| -rw-r--r-- | src/xkmout.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/xkmout.c b/src/xkmout.c index c4aaadf..18418f1 100644 --- a/src/xkmout.c +++ b/src/xkmout.c @@ -24,12 +24,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86: xc/lib/xkbfile/xkmout.c,v 1.5 2001/07/25 15:04:58 dawes Exp $ */ #include <stdio.h> #include <ctype.h> -#ifndef X_NOT_STDC_ENV #include <stdlib.h> -#endif #include <X11/Xfuncs.h> #include <X11/Xlib.h> #include <X11/XKBlib.h> @@ -666,7 +665,7 @@ unsigned tmp,size= 0; for (i=xkb->min_key_code;i<=(int)xkb->max_key_code;i++) { char *typeName[XkbNumKbdGroups]; wireMap.width= XkbKeyGroupsWidth(xkb,i); - wireMap.num_groups= XkbKeyNumGroups(xkb,i); + wireMap.num_groups= XkbKeyGroupInfo(xkb,i); if (xkb->map && xkb->map->modmap) wireMap.modifier_map= xkb->map->modmap[i]; else wireMap.modifier_map= 0; @@ -705,7 +704,7 @@ unsigned tmp,size= 0; size+= xkmPutCountedString(file,typeName[g]); } } - if (wireMap.num_groups>0) { + if (XkbNumGroups(wireMap.num_groups)>0) { KeySym *sym; sym= XkbKeySymsPtr(xkb,i); for (n=XkbKeyNumSyms(xkb,i);n>0;n--,sym++) { |