diff options
Diffstat (limited to 'libXt/include/X11')
31 files changed, 10 insertions, 125 deletions
diff --git a/libXt/include/X11/CallbackI.h b/libXt/include/X11/CallbackI.h index 64e815256..5adb54eb6 100644 --- a/libXt/include/X11/CallbackI.h +++ b/libXt/include/X11/CallbackI.h @@ -1,4 +1,3 @@ -/* $Xorg: CallbackI.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ /**************************************************************** * diff --git a/libXt/include/X11/Composite.h b/libXt/include/X11/Composite.h index c3c982868..e845fead2 100644 --- a/libXt/include/X11/Composite.h +++ b/libXt/include/X11/Composite.h @@ -1,5 +1,3 @@ -/* $Xorg: Composite.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ #ifndef _XtComposite_h #define _XtComposite_h diff --git a/libXt/include/X11/CompositeP.h b/libXt/include/X11/CompositeP.h index e93275ace..b51dcd3c3 100644 --- a/libXt/include/X11/CompositeP.h +++ b/libXt/include/X11/CompositeP.h @@ -1,5 +1,3 @@ -/* $Xorg: CompositeP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group diff --git a/libXt/include/X11/ConstrainP.h b/libXt/include/X11/ConstrainP.h index 7030a3411..53c01c160 100644 --- a/libXt/include/X11/ConstrainP.h +++ b/libXt/include/X11/ConstrainP.h @@ -1,5 +1,3 @@ -/* $Xorg: ConstrainP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ -/* $oHeader: ConstrainP.h,v 1.2 88/08/18 15:54:15 asente Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group diff --git a/libXt/include/X11/Constraint.h b/libXt/include/X11/Constraint.h index 977e7eeac..f04155c58 100644 --- a/libXt/include/X11/Constraint.h +++ b/libXt/include/X11/Constraint.h @@ -1,5 +1,3 @@ -/* $Xorg: Constraint.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ -/* $oHeader: Constraint.h,v 1.2 88/08/18 15:54:18 asente Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group diff --git a/libXt/include/X11/ConvertI.h b/libXt/include/X11/ConvertI.h index f3f7fb0ba..b66b3c0a5 100644 --- a/libXt/include/X11/ConvertI.h +++ b/libXt/include/X11/ConvertI.h @@ -1,5 +1,3 @@ -/* $Xorg: ConvertI.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/ConvertI.h,v 1.3 2001/12/14 19:56:09 dawes Exp $ */ _XFUNCPROTOBEGIN diff --git a/libXt/include/X11/Core.h b/libXt/include/X11/Core.h index 5127b501a..4303aff57 100644 --- a/libXt/include/X11/Core.h +++ b/libXt/include/X11/Core.h @@ -1,8 +1,3 @@ -/* -* $Xorg: Core.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ -* $oHeader: Core.h,v 1.2 88/08/18 15:54:32 asente Exp $ -*/ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group diff --git a/libXt/include/X11/CoreP.h b/libXt/include/X11/CoreP.h index 57836e615..989ba16e2 100644 --- a/libXt/include/X11/CoreP.h +++ b/libXt/include/X11/CoreP.h @@ -1,8 +1,3 @@ -/* -* $Xorg: CoreP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ -* $oHeader: CoreP.h,v 1.2 88/08/18 15:54:37 asente Exp $ -*/ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group diff --git a/libXt/include/X11/CreateI.h b/libXt/include/X11/CreateI.h index e0ca9a3a6..e00ba6550 100644 --- a/libXt/include/X11/CreateI.h +++ b/libXt/include/X11/CreateI.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifndef _XtcreateI_h #define _XtcreateI_h diff --git a/libXt/include/X11/EventI.h b/libXt/include/X11/EventI.h index d2d1d0f43..0b95b070e 100644 --- a/libXt/include/X11/EventI.h +++ b/libXt/include/X11/EventI.h @@ -1,6 +1,3 @@ -/* $Xorg: EventI.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ -/* $oHeader: EventI.h,v 1.3 88/08/24 09:21:11 asente Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -47,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/EventI.h,v 1.3 2001/12/14 19:56:12 dawes Exp $ */ /* * Event.h - exported types and functions for toolkit event handler diff --git a/libXt/include/X11/HookObjI.h b/libXt/include/X11/HookObjI.h index c0858c2b5..94c0cbbf8 100644 --- a/libXt/include/X11/HookObjI.h +++ b/libXt/include/X11/HookObjI.h @@ -1,5 +1,3 @@ -/* $Xorg: HookObjI.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group diff --git a/libXt/include/X11/InitialI.h b/libXt/include/X11/InitialI.h index 2ae9b743c..28b34d706 100644 --- a/libXt/include/X11/InitialI.h +++ b/libXt/include/X11/InitialI.h @@ -1,5 +1,3 @@ -/* $Xorg: InitialI.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/InitialI.h,v 3.10 2001/12/14 19:56:18 dawes Exp $ */ #ifndef _XtinitialI_h #define _XtinitialI_h diff --git a/libXt/include/X11/Intrinsic.h b/libXt/include/X11/Intrinsic.h index 0461b842f..d09acad54 100644 --- a/libXt/include/X11/Intrinsic.h +++ b/libXt/include/X11/Intrinsic.h @@ -1,5 +1,3 @@ -/* $Xorg: Intrinsic.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -48,7 +46,6 @@ 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/lib/Xt/Intrinsic.h,v 3.8 2001/12/14 19:56:22 dawes Exp $ */ #ifndef _XtIntrinsic_h #define _XtIntrinsic_h @@ -1858,6 +1855,15 @@ extern void XtFree( char* /* ptr */ ); +#ifndef _X_RESTRICT_KYWD +# define _X_RESTRICT_KYWD +#endif +extern Cardinal XtAsprintf( + String *new_string, + _Xconst char * _X_RESTRICT_KYWD format, + ... +) _X_ATTRIBUTE_PRINTF(2,3); + #ifdef XTTRACEMEMORY extern char *_XtMalloc( /* implementation-private */ diff --git a/libXt/include/X11/IntrinsicI.h b/libXt/include/X11/IntrinsicI.h index d88166fc3..845ab483a 100644 --- a/libXt/include/X11/IntrinsicI.h +++ b/libXt/include/X11/IntrinsicI.h @@ -1,5 +1,3 @@ -/* $Xorg: IntrinsicI.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.8 2001/12/14 19:56:25 dawes Exp $ */ #ifndef _XtintrinsicI_h #define _XtintrinsicI_h @@ -111,37 +108,6 @@ SOFTWARE. #define _XBCOPYFUNC _XtBcopy #include <X11/Xfuncs.h> -/* If the alignment characteristics of your machine are right, these may be - faster */ - -#ifdef UNALIGNED - -#define XtMemmove(dst, src, size) \ - if ((char *)(dst) != (char *)(src)) { \ - if (size == sizeof(int)) \ - *((int *) (dst)) = *((int *) (src)); \ - else if (size == sizeof(char)) \ - *((char *) (dst)) = *((char *) (src)); \ - else if (size == sizeof(short)) \ - *((short *) (dst)) = *((short *) (src)); \ - else \ - (void) memcpy((char *) (dst), (char *) (src), (int) (size)); \ - } - -#define XtBZero(dst, size) \ - if (size == sizeof(int)) \ - *((int *) (dst)) = 0; \ - else \ - bzero((char *) (dst), (int) (size)) - -#define XtMemcmp(b1, b2, size) \ - (size == sizeof(int) ? \ - *((int *) (b1)) != *((int *) (b2)) \ - : memcmp((char *) (b1), (char *) (b2), (int) (size)) \ - ) - -#else - #define XtMemmove(dst, src, size) \ if ((char *)(dst) != (char *)(src)) { \ (void) memcpy((char *) (dst), (char *) (src), (int) (size)); \ @@ -153,8 +119,6 @@ SOFTWARE. #define XtMemcmp(b1, b2, size) \ memcmp((char *) (b1), (char *) (b2), (int) (size)) -#endif - /**************************************************************** * diff --git a/libXt/include/X11/IntrinsicP.h b/libXt/include/X11/IntrinsicP.h index 517c55d2b..bb6570bbf 100644 --- a/libXt/include/X11/IntrinsicP.h +++ b/libXt/include/X11/IntrinsicP.h @@ -1,5 +1,3 @@ -/* $Xorg: IntrinsicP.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ #ifndef _XtintrinsicP_h #define _XtintrinsicP_h diff --git a/libXt/include/X11/Object.h b/libXt/include/X11/Object.h index 5ef65de3c..584fe3deb 100644 --- a/libXt/include/X11/Object.h +++ b/libXt/include/X11/Object.h @@ -1,5 +1,3 @@ -/* $Xorg: Object.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ -/* $oHeader: Object.h,v 1.2 88/08/18 15:55:32 asente Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group diff --git a/libXt/include/X11/ObjectP.h b/libXt/include/X11/ObjectP.h index 0f484d2fd..d71d22f1d 100644 --- a/libXt/include/X11/ObjectP.h +++ b/libXt/include/X11/ObjectP.h @@ -1,5 +1,3 @@ -/* $Xorg: ObjectP.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group diff --git a/libXt/include/X11/PassivGraI.h b/libXt/include/X11/PassivGraI.h index 10591ac4d..353732f30 100644 --- a/libXt/include/X11/PassivGraI.h +++ b/libXt/include/X11/PassivGraI.h @@ -1,7 +1,3 @@ -/* -* $Xorg: PassivGraI.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ -*/ - /******************************************************** Copyright 1988 by Hewlett-Packard Company @@ -51,7 +47,6 @@ 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/lib/Xt/PassivGraI.h,v 1.3 2001/12/14 19:56:27 dawes Exp $ */ #ifndef _PDI_h_ #define _PDI_h_ diff --git a/libXt/include/X11/RectObj.h b/libXt/include/X11/RectObj.h index 81e43a5e2..e582112f6 100644 --- a/libXt/include/X11/RectObj.h +++ b/libXt/include/X11/RectObj.h @@ -1,5 +1,3 @@ -/* $Xorg: RectObj.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ -/* $oHeader: RectObj.h,v 1.2 88/08/18 17:39:17 asente Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group diff --git a/libXt/include/X11/RectObjP.h b/libXt/include/X11/RectObjP.h index d6ffb7823..1fc06f22e 100644 --- a/libXt/include/X11/RectObjP.h +++ b/libXt/include/X11/RectObjP.h @@ -1,5 +1,3 @@ -/* $Xorg: RectObjP.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ -/* $oHeader: RectObjP.h,v 1.2 88/08/18 15:55:52 asente Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group diff --git a/libXt/include/X11/ResConfigP.h b/libXt/include/X11/ResConfigP.h index a06cda715..0c94577bb 100644 --- a/libXt/include/X11/ResConfigP.h +++ b/libXt/include/X11/ResConfigP.h @@ -1,4 +1,3 @@ -/* $Xorg: ResConfigP.h,v 1.5 2001/02/09 02:03:56 xorgcvs Exp $ */ /* Copyright 1987, 1988, 1998 The Open Group @@ -52,7 +51,6 @@ dealings in this Software without prior written authorization from the IBM Corporation. ******************************************************************/ -/* $XFree86: xc/lib/Xt/ResConfigP.h,v 3.7 2001/12/20 19:40:59 tsi Exp $ */ #ifndef _RESCONFIGP_H #define _RESCONFIGP_H diff --git a/libXt/include/X11/ResourceI.h b/libXt/include/X11/ResourceI.h index 3db97f83e..4533f0642 100644 --- a/libXt/include/X11/ResourceI.h +++ b/libXt/include/X11/ResourceI.h @@ -1,5 +1,3 @@ -/* $Xorg: ResourceI.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/ResourceI.h,v 1.5 2001/12/14 19:56:28 dawes Exp $ */ /**************************************************************** * diff --git a/libXt/include/X11/SelectionI.h b/libXt/include/X11/SelectionI.h index e589aece5..7f39b8799 100644 --- a/libXt/include/X11/SelectionI.h +++ b/libXt/include/X11/SelectionI.h @@ -1,5 +1,3 @@ -/* $Xorg: SelectionI.h,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group diff --git a/libXt/include/X11/ShellI.h b/libXt/include/X11/ShellI.h index 6a093d791..c1ee0b159 100644 --- a/libXt/include/X11/ShellI.h +++ b/libXt/include/X11/ShellI.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifndef _XtShellInternal_h #define _XtShellInternal_h diff --git a/libXt/include/X11/ShellP.h b/libXt/include/X11/ShellP.h index 7297d3321..07d96669b 100644 --- a/libXt/include/X11/ShellP.h +++ b/libXt/include/X11/ShellP.h @@ -1,5 +1,3 @@ -/* $Xorg: ShellP.h,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group diff --git a/libXt/include/X11/ThreadsI.h b/libXt/include/X11/ThreadsI.h index b1c51e73f..ff6dee3da 100644 --- a/libXt/include/X11/ThreadsI.h +++ b/libXt/include/X11/ThreadsI.h @@ -1,8 +1,6 @@ -/* $Xorg: ThreadsI.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */ - /************************************************************ -Copyright 1993 Sun Microsystems, Inc. All rights reserved. +Copyright (c) 1993, Oracle and/or its affiliates. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/libXt/include/X11/TranslateI.h b/libXt/include/X11/TranslateI.h index 6cc3099cf..9ff59e946 100644 --- a/libXt/include/X11/TranslateI.h +++ b/libXt/include/X11/TranslateI.h @@ -1,5 +1,3 @@ -/* $Xorg: TranslateI.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/TranslateI.h,v 1.3 2001/12/14 19:56:32 dawes Exp $ */ /* * TranslateI.h - Header file private to translation management diff --git a/libXt/include/X11/VarargsI.h b/libXt/include/X11/VarargsI.h index 76ce9bc7e..b3e6827ee 100644 --- a/libXt/include/X11/VarargsI.h +++ b/libXt/include/X11/VarargsI.h @@ -1,5 +1,3 @@ -/* $Xorg: VarargsI.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */ - /* Copyright 1985, 1986, 1987, 1988, 1989, 1998 The Open Group @@ -25,7 +23,6 @@ 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/lib/Xt/VarargsI.h,v 3.6 2001/12/14 19:56:32 dawes Exp $ */ #ifndef _VarargsI_h_ #define _VarargsI_h_ diff --git a/libXt/include/X11/Vendor.h b/libXt/include/X11/Vendor.h index 633d17aa1..f7a6639a9 100644 --- a/libXt/include/X11/Vendor.h +++ b/libXt/include/X11/Vendor.h @@ -1,8 +1,3 @@ -/* -* $Xorg: Vendor.h,v 1.5 2001/02/09 02:03:59 xorgcvs Exp $ -* $oHeader: Vendor.h,v 1.2 88/08/18 15:56:44 asente Exp $ -*/ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group diff --git a/libXt/include/X11/VendorP.h b/libXt/include/X11/VendorP.h index e60857d9e..2815e579b 100644 --- a/libXt/include/X11/VendorP.h +++ b/libXt/include/X11/VendorP.h @@ -1,8 +1,3 @@ -/* -* $Xorg: VendorP.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ -* $oHeader: VendorP.h,v 1.2 88/08/18 15:56:48 asente Exp $ -*/ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group diff --git a/libXt/include/X11/Xtos.h b/libXt/include/X11/Xtos.h index 013b2416c..707932190 100644 --- a/libXt/include/X11/Xtos.h +++ b/libXt/include/X11/Xtos.h @@ -1,7 +1,3 @@ -/* -* $Xorg: Xtos.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ -*/ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -48,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Xtos.h,v 3.12tsi Exp $ */ #ifndef _Xtos_h #define _Xtos_h |