aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--X11/extensions/XKBbells.h2
-rw-r--r--X11/extensions/XKBconfig.h2
-rw-r--r--X11/extensions/XKBfile.h26
-rw-r--r--X11/extensions/XKBrules.h2
-rw-r--r--X11/extensions/XKM.h1
-rw-r--r--X11/extensions/XKMformat.h2
-rw-r--r--filesthatshouldbethesame.py7
-rw-r--r--libxkbfile/include/X11/extensions/XKBrules.h3
8 files changed, 21 insertions, 24 deletions
diff --git a/X11/extensions/XKBbells.h b/X11/extensions/XKBbells.h
index 16a9275ea..c78811b27 100644
--- a/X11/extensions/XKBbells.h
+++ b/X11/extensions/XKBbells.h
@@ -1,7 +1,6 @@
#ifndef _XKBBELLS_H_
#define _XKBBELLS_H_ 1
-/* $Xorg: XKBbells.h,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -27,7 +26,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#define XkbBN_Info "Info"
#define XkbBN_Warning "Warning"
diff --git a/X11/extensions/XKBconfig.h b/X11/extensions/XKBconfig.h
index fbc6a600e..4816917c8 100644
--- a/X11/extensions/XKBconfig.h
+++ b/X11/extensions/XKBconfig.h
@@ -1,7 +1,6 @@
#ifndef _XKBCONFIG_H_
#define _XKBCONFIG_H_ 1
-/* $Xorg: XKBconfig.h,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -27,7 +26,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/XKBconfig.h,v 3.5 2001/01/17 19:43:39 dawes Exp $ */
typedef struct _XkbConfigRtrn *XkbConfigRtrnPtr;
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(
diff --git a/X11/extensions/XKBrules.h b/X11/extensions/XKBrules.h
index 91ec51099..f898da8d9 100644
--- a/X11/extensions/XKBrules.h
+++ b/X11/extensions/XKBrules.h
@@ -1,7 +1,6 @@
#ifndef _XKBRULES_H_
#define _XKBRULES_H_ 1
-/* $Xorg: XKBrules.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
@@ -27,7 +26,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/XKBrules.h,v 3.5 2002/11/26 01:43:25 dawes Exp $ */
/***====================================================================***/
diff --git a/X11/extensions/XKM.h b/X11/extensions/XKM.h
index c6c9f5195..13dbed54c 100644
--- a/X11/extensions/XKM.h
+++ b/X11/extensions/XKM.h
@@ -1,4 +1,3 @@
-/* $Xorg: XKM.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/X11/extensions/XKMformat.h b/X11/extensions/XKMformat.h
index 154da5694..6204e5da8 100644
--- a/X11/extensions/XKMformat.h
+++ b/X11/extensions/XKMformat.h
@@ -1,4 +1,3 @@
-/* $Xorg: XKMformat.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifndef _XKMFORMAT_H_
#define _XKMFORMAT_H_ 1
diff --git a/filesthatshouldbethesame.py b/filesthatshouldbethesame.py
index 840bc1bce..613036513 100644
--- a/filesthatshouldbethesame.py
+++ b/filesthatshouldbethesame.py
@@ -183,6 +183,13 @@ libXmu\include\X11\Xmu\WidgetNode.h X11\Xmu\WidgetNode.h
libXmu\include\X11\Xmu\WinUtil.h X11\Xmu\WinUtil.h
libXmu\include\X11\Xmu\Xct.h X11\Xmu\Xct.h
libXmu\include\X11\Xmu\Xmu.h X11\Xmu\Xmu.h
+
+libxkbfile\include\X11\extensions\XKBfile.h X11\extensions\XKBfile.h
+libxkbfile\include\X11\extensions\XKM.h X11\extensions\XKM.h
+libxkbfile\include\X11\extensions\XKBbells.h X11\extensions\XKBbells.h
+libxkbfile\include\X11\extensions\XKBconfig.h X11\extensions\XKBconfig.h
+libxkbfile\include\X11\extensions\XKBrules.h X11\extensions\XKBrules.h
+libxkbfile\include\X11\extensions\XKMformat.h X11\extensions\XKMformat.h
"""
Files=FilesStr.split()
diff --git a/libxkbfile/include/X11/extensions/XKBrules.h b/libxkbfile/include/X11/extensions/XKBrules.h
index 59d11cd88..f898da8d9 100644
--- a/libxkbfile/include/X11/extensions/XKBrules.h
+++ b/libxkbfile/include/X11/extensions/XKBrules.h
@@ -179,7 +179,7 @@ extern void XkbRF_Free(
#define _XKB_RF_NAMES_PROP_MAXLEN 1024
#ifndef XKB_IN_SERVER
-
+#ifndef _MSC_VER
extern Bool XkbRF_GetNamesProp(
Display * /* dpy */,
char ** /* rules_file_rtrn */,
@@ -193,6 +193,7 @@ extern Bool XkbRF_SetNamesProp(
);
#endif
+#endif
_XFUNCPROTOEND
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 19:42:25 +0000