diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-25 08:32:21 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-25 08:32:21 +0100 |
| commit | 849d328b25c2f3c87d539e1fe7af38e7580a0409 (patch) | |
| tree | 349c425a87ddb3aaa1d7832d5a8e68252fc73ddb /xorg-server/include/xkbfile.h | |
| parent | a8a12d4c8be177f63cae7dc96c2b52f09e228a76 (diff) | |
| parent | a0b4a1330be6a36ad095222d2ea83927cd33514d (diff) | |
| download | vcxsrv-849d328b25c2f3c87d539e1fe7af38e7580a0409.tar.gz vcxsrv-849d328b25c2f3c87d539e1fe7af38e7580a0409.tar.bz2 vcxsrv-849d328b25c2f3c87d539e1fe7af38e7580a0409.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/glxdriswrast.c
xorg-server/glx/single2.c
xorg-server/hw/xwin/winconfig.c
xorg-server/os/osinit.c
xorg-server/os/xdmcp.c
xorg-server/xkb/xkbInit.c
Diffstat (limited to 'xorg-server/include/xkbfile.h')
| -rw-r--r-- | xorg-server/include/xkbfile.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/include/xkbfile.h b/xorg-server/include/xkbfile.h index a4b99ee07..db7dbfa40 100644 --- a/xorg-server/include/xkbfile.h +++ b/xorg-server/include/xkbfile.h @@ -136,7 +136,7 @@ extern _X_EXPORT char * XkbConfigText( unsigned /* format */ ); -extern _X_EXPORT char * XkbSIMatchText( +extern _X_EXPORT const char * XkbSIMatchText( unsigned /* type */, unsigned /* format */ ); @@ -161,7 +161,7 @@ extern _X_EXPORT char * XkbDoodadTypeText( unsigned /* format */ ); -extern _X_EXPORT char * XkbActionTypeText( +extern _X_EXPORT const char * XkbActionTypeText( unsigned /* type */, unsigned /* format */ ); |