mirror of
https://gitlab.freedesktop.org/xorg/proto/xorgproto.git
synced 2026-05-08 18:18:01 +02:00
Merging XORG-CURRENT into trunk
This commit is contained in:
Egbert Eich
parent
e88a09c1df
commit
5b67de2bce
13 changed files with 25 additions and 16 deletions
5
X.h
5
X.h
|
|
@ -53,7 +53,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|||
SOFTWARE.
|
||||
|
||||
******************************************************************/
|
||||
/* $XFree86: xc/include/X.h,v 1.7 2003/07/18 15:53:24 tsi Exp $ */
|
||||
/* $XFree86: xc/include/X.h,v 1.6 2003/07/09 15:27:28 tsi Exp $ */
|
||||
|
||||
#define X_PROTOCOL 11 /* current protocol version */
|
||||
#define X_PROTOCOL_REVISION 0 /* current minor version */
|
||||
|
|
@ -304,6 +304,9 @@ are reserved in the protocol for errors and replies. */
|
|||
#define FamilyChaos 2
|
||||
#define FamilyInternet6 6 /* IPv6 */
|
||||
|
||||
/* authentication families not tied to a specific protocol */
|
||||
#define FamilyServerInterpreted 5
|
||||
|
||||
/* Property notification */
|
||||
|
||||
#define PropertyNewValue 0
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/include/XF86keysym.h,v 1.17 2003/02/14 22:02:26 dawes Exp $ */
|
||||
/* $XFree86: xc/include/XF86keysym.h,v 1.16 2003/02/11 02:51:10 dawes Exp $ */
|
||||
|
||||
/*
|
||||
* XFree86 vendor specific keysyms.
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
|
|||
from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86: xc/include/Xalloca.h,v 3.11 2002/12/01 20:08:41 tsi Exp $ */
|
||||
/* $XFree86: xc/include/Xalloca.h,v 3.10 2001/12/14 19:53:25 dawes Exp $ */
|
||||
|
||||
/*
|
||||
* The purpose of this header is to define the macros ALLOCATE_LOCAL and
|
||||
|
|
|
|||
2
Xarch.h
2
Xarch.h
|
|
@ -25,7 +25,7 @@
|
|||
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
/* $XFree86: xc/include/Xarch.h,v 1.11 2003/05/27 22:26:24 tsi Exp $ */
|
||||
/* $XFree86: xc/include/Xarch.h,v 1.10tsi Exp $ */
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
2
Xdefs.h
2
Xdefs.h
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/include/Xdefs.h,v 1.3 2001/07/24 08:32:53 alanh Exp $ */
|
||||
/* $XFree86: xc/include/Xdefs.h,v 1.2 1999/08/22 06:21:20 dawes Exp $ */
|
||||
|
||||
/***********************************************************
|
||||
|
||||
|
|
|
|||
7
Xfuncs.h
7
Xfuncs.h
|
|
@ -1,4 +1,5 @@
|
|||
/*
|
||||
* $XdotOrg: xc/include/Xfuncs.h,v 1.1.4.2 2003/12/20 00:28:21 kaleb Exp $
|
||||
* $Xorg: Xfuncs.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $
|
||||
*
|
||||
*
|
||||
|
|
@ -25,7 +26,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
|
|||
in this Software without prior written authorization from The Open Group.
|
||||
*
|
||||
*/
|
||||
/* $XFree86: xc/include/Xfuncs.h,v 3.11 2003/12/19 02:05:37 dawes Exp $ */
|
||||
/* $XFree86: xc/include/Xfuncs.h,v 3.10 2002/05/31 18:45:38 dawes Exp $ */
|
||||
|
||||
#ifndef _XFUNCS_H_
|
||||
#define _XFUNCS_H_
|
||||
|
|
@ -40,14 +41,14 @@ void bcopy();
|
|||
void bzero();
|
||||
int bcmp();
|
||||
#else
|
||||
#if defined(SYSV) && !defined(SCO325)
|
||||
#if defined(SYSV) && !defined(SCO325) && !defined(sun)
|
||||
#include <memory.h>
|
||||
void bcopy();
|
||||
#define bzero(b,len) memset(b, 0, len)
|
||||
#define bcmp(b1,b2,len) memcmp(b1, b2, len)
|
||||
#else
|
||||
#include <string.h>
|
||||
#ifdef SCO325
|
||||
#if defined(SCO325) || defined(sun)
|
||||
#include <strings.h>
|
||||
#endif
|
||||
#define _XFUNCS_H_INCLUDED_STRING_H
|
||||
|
|
|
|||
4
Xmd.h
4
Xmd.h
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/include/Xmd.h,v 3.19 2003/10/23 15:19:01 tsi Exp $ */
|
||||
/* $XFree86: xc/include/Xmd.h,v 3.18tsi Exp $ */
|
||||
/***********************************************************
|
||||
|
||||
Copyright 1987, 1998 The Open Group
|
||||
|
|
@ -64,7 +64,7 @@ SOFTWARE.
|
|||
defined(__sparc64__) || \
|
||||
defined(__s390x__) || \
|
||||
(defined(__hppa__) && defined(__LP64__)) || \
|
||||
defined(__AMD64__) || defined(AMD64) || \
|
||||
defined(__amd64__) || defined(amd64) || \
|
||||
(defined(sgi) && (_MIPS_SZLONG == 64))
|
||||
#define LONG64 /* 32/64-bit architecture */
|
||||
#endif
|
||||
|
|
|
|||
6
Xos.h
6
Xos.h
|
|
@ -1,4 +1,5 @@
|
|||
/*
|
||||
* $XdotOrg: xc/include/Xos.h,v 1.1.4.4 2004/02/16 20:55:02 alanc Exp $
|
||||
* $Xorg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $
|
||||
*
|
||||
*
|
||||
|
|
@ -27,7 +28,7 @@ in this Software without prior written authorization from The Open Group.
|
|||
* The X Window System is a Trademark of The Open Group.
|
||||
*
|
||||
*/
|
||||
/* $XFree86: xc/include/Xos.h,v 3.42 2003/12/31 01:18:41 tsi Exp $ */
|
||||
/* $XFree86: xc/include/Xos.h,v 3.41tsi Exp $ */
|
||||
|
||||
/* This is a collection of things to try and minimize system dependencies
|
||||
* in a "signficant" number of source files.
|
||||
|
|
@ -94,6 +95,9 @@ in this Software without prior written authorization from The Open Group.
|
|||
#ifdef SCO325
|
||||
#include <strings.h>
|
||||
#else
|
||||
#if (defined(sun) && defined(__SVR4))
|
||||
#include <strings.h>
|
||||
#endif
|
||||
#ifdef __STDC__
|
||||
#ifndef index
|
||||
#define index(s,c) (strchr((s),(c)))
|
||||
|
|
|
|||
2
Xos_r.h
2
Xos_r.h
|
|
@ -22,7 +22,7 @@ Except as contained in this notice, the name of The Open Group shall not be
|
|||
used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
*/
|
||||
/* $XFree86: xc/include/Xos_r.h,v 1.19 2003/10/23 15:19:01 tsi Exp $ */
|
||||
/* $XFree86: xc/include/Xos_r.h,v 1.18tsi Exp $ */
|
||||
|
||||
/*
|
||||
* Various and sundry Thread-Safe functions used by X11, Motif, and CDE.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
/*
|
||||
* O/S-dependent (mis)feature macro definitions
|
||||
*
|
||||
* $XdotOrg: Xosdefs.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $
|
||||
* $Xorg: Xosdefs.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $
|
||||
*
|
||||
Copyright 1991, 1998 The Open Group
|
||||
|
|
@ -25,7 +26,7 @@ Except as contained in this notice, the name of The Open Group shall not be
|
|||
used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
*/
|
||||
/* $XFree86: xc/include/Xosdefs.h,v 3.21 2003/12/18 16:38:34 dawes Exp $ */
|
||||
/* $XFree86: xc/include/Xosdefs.h,v 3.20 2002/05/31 18:45:39 dawes Exp $ */
|
||||
|
||||
#ifndef _XOSDEFS_H_
|
||||
#define _XOSDEFS_H_
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
|
|||
in this Software without prior written authorization from The Open Group.
|
||||
* *
|
||||
*/
|
||||
/* $XFree86: xc/include/Xthreads.h,v 3.11 2003/03/08 19:14:53 herrb Exp $ */
|
||||
/* $XFree86: Xthreads.h,v 3.10 2001/12/14 19:53:26 dawes Exp $ */
|
||||
|
||||
#ifndef _XTHREADS_H_
|
||||
#define _XTHREADS_H_
|
||||
|
|
|
|||
2
keysym.h
2
keysym.h
|
|
@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|||
SOFTWARE.
|
||||
|
||||
******************************************************************/
|
||||
/* $XFree86: xc/include/keysym.h,v 1.4 2001/12/14 19:53:26 dawes Exp $ */
|
||||
/* $XFree86: xc/include/keysym.h,v 1.3 2001/01/17 17:53:12 dawes Exp $ */
|
||||
|
||||
/* default keysyms */
|
||||
#define XK_MISCELLANY
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|||
SOFTWARE.
|
||||
|
||||
******************************************************************/
|
||||
/* $XFree86: xc/include/keysymdef.h,v 1.12 2001/12/14 19:53:26 dawes Exp $ */
|
||||
/* $XFree86: xc/include/keysymdef.h,v 1.11 2001/01/17 17:53:12 dawes Exp $ */
|
||||
|
||||
#define XK_VoidSymbol 0xFFFFFF /* void symbol */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue