diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 16:08:36 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 16:08:36 +0200 |
| commit | 0264c85a96701934cecf26413f89670f9f8e3e19 (patch) | |
| tree | ac6267f4589081fd2728a840c560cf1935fe5d84 /X11/extensions/XKBfile.h | |
| parent | ff3771375056dc836f061950822dd796787641a7 (diff) | |
| download | vcxsrv-0264c85a96701934cecf26413f89670f9f8e3e19.tar.gz vcxsrv-0264c85a96701934cecf26413f89670f9f8e3e19.tar.bz2 vcxsrv-0264c85a96701934cecf26413f89670f9f8e3e19.zip | |
Synchronised files
Diffstat (limited to 'X11/extensions/XKBfile.h')
| -rw-r--r-- | X11/extensions/XKBfile.h | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/X11/extensions/XKBfile.h b/X11/extensions/XKBfile.h index bbd7e6fcd..0d2f52bde 100644 --- a/X11/extensions/XKBfile.h +++ b/X11/extensions/XKBfile.h @@ -1,9 +1,7 @@ -/* $XFree86: xc/lib/xkbfile/XKBfile.h,v 3.6 2003/10/24 16:33:09 tsi Exp $ */ #ifndef _XKBFILE_H_ #define _XKBFILE_H_ 1 -/* $Xorg: XKBfile.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -12,19 +10,19 @@ 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 + 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 + 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 + + 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 + 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. @@ -85,9 +83,9 @@ typedef void (*XkbFileAddOnFunc)( #define _XkbErrXReqFailure 25 #define _XkbErrBadImplementation 26 -extern char * _XkbErrMessages[]; +extern const char * _XkbErrMessages[]; extern unsigned _XkbErrCode; -extern char * _XkbErrLocation; +extern const char * _XkbErrLocation; extern unsigned _XkbErrData; /***====================================================================***/ @@ -287,7 +285,7 @@ typedef struct _XkbDrawable { XkbSectionPtr section; } u; struct _XkbDrawable * next; -} XkbDrawableRec,*XkbDrawablePtr; +} XkbDrawableRec,*XkbDrawablePtr; extern XkbDrawablePtr XkbGetOrderedDrawables( |