svn merge ^/branches/released .

1 files changed, 119 insertions, 121 deletions

diff --git a/libXt/include/X11/CallbackI.h b/libXt/include/X11/CallbackI.h
index 64e815256..d11134a5d 100644
--- a/libXt/include/X11/CallbackI.h
+++ b/libXt/include/X11/CallbackI.h
@@ -1,121 +1,119 @@
-/* $Xorg: CallbackI.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-/***********************************************************
-
-Copyright 1987, 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-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.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without 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 Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL 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.
-
-******************************************************************/
-/* $XFree86$ */
-
-/****************************************************************
- *
- * Callbacks
- *
- ****************************************************************/
-
-typedef XrmResource **CallbackTable;
-
-#define _XtCBCalling 1
-#define _XtCBFreeAfterCalling 2
-
-_XFUNCPROTOBEGIN
-
-typedef struct internalCallbackRec {
-    unsigned short count;
-    char	   is_padded;	/* contains NULL padding for external form */
-    char	   call_state;  /* combination of _XtCB{FreeAfter}Calling */
-#ifdef LONG64
-    unsigned int   align_pad;	/* padding to align callback list */
-#endif
-    /* XtCallbackList */
-} InternalCallbackRec, *InternalCallbackList;
-
-typedef Boolean (*_XtConditionProc)(
-    XtPointer	/* data */
-);
-
-extern void _XtAddCallback(
-    InternalCallbackList*	/* callbacks */,
-    XtCallbackProc		/* callback */,
-    XtPointer 			/* closure */
-);
-
-extern void _XtAddCallbackOnce(
-    InternalCallbackList*	/* callbacks */,
-    XtCallbackProc		/* callback */,
-    XtPointer 			/* closure */
-);
-
-extern InternalCallbackList _XtCompileCallbackList(
-    XtCallbackList		/* xtcallbacks */
-);
-
-extern XtCallbackList _XtGetCallbackList(
-    InternalCallbackList*	/* callbacks */
-);
-
-extern void _XtRemoveAllCallbacks(
-    InternalCallbackList*	/* callbacks */
-);
-
-extern void _XtRemoveCallback(
-    InternalCallbackList*	/* callbacks */,
-    XtCallbackProc		/* callback */,
-    XtPointer			/* closure */
-);
-
-extern void _XtPeekCallback(
-    Widget			/* widget */,
-    XtCallbackList		/* callbacks */,
-    XtCallbackProc *		/* callback */,
-    XtPointer *			/* closure */
-);
-
-extern void _XtCallConditionalCallbackList(
-    Widget			/* widget */,
-    XtCallbackList		/* callbacks */,
-    XtPointer			/* call_data */,
-    _XtConditionProc		/* cond_proc */
-);
-
-_XFUNCPROTOEND
+/***********************************************************

+

+Copyright 1987, 1988, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+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.

+

+

+Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its 

+documentation for any purpose and without 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 Digital not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  

+

+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

+DIGITAL 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.

+

+******************************************************************/

+

+/****************************************************************

+ *

+ * Callbacks

+ *

+ ****************************************************************/

+

+typedef XrmResource **CallbackTable;

+

+#define _XtCBCalling 1

+#define _XtCBFreeAfterCalling 2

+

+_XFUNCPROTOBEGIN

+

+typedef struct internalCallbackRec {

+    unsigned short count;

+    char	   is_padded;	/* contains NULL padding for external form */

+    char	   call_state;  /* combination of _XtCB{FreeAfter}Calling */

+#ifdef LONG64

+    unsigned int   align_pad;	/* padding to align callback list */

+#endif

+    /* XtCallbackList */

+} InternalCallbackRec, *InternalCallbackList;

+

+typedef Boolean (*_XtConditionProc)(

+    XtPointer	/* data */

+);

+

+extern void _XtAddCallback(

+    InternalCallbackList*	/* callbacks */,

+    XtCallbackProc		/* callback */,

+    XtPointer 			/* closure */

+);

+

+extern void _XtAddCallbackOnce(

+    InternalCallbackList*	/* callbacks */,

+    XtCallbackProc		/* callback */,

+    XtPointer 			/* closure */

+);

+

+extern InternalCallbackList _XtCompileCallbackList(

+    XtCallbackList		/* xtcallbacks */

+);

+

+extern XtCallbackList _XtGetCallbackList(

+    InternalCallbackList*	/* callbacks */

+);

+

+extern void _XtRemoveAllCallbacks(

+    InternalCallbackList*	/* callbacks */

+);

+

+extern void _XtRemoveCallback(

+    InternalCallbackList*	/* callbacks */,

+    XtCallbackProc		/* callback */,

+    XtPointer			/* closure */

+);

+

+extern void _XtPeekCallback(

+    Widget			/* widget */,

+    XtCallbackList		/* callbacks */,

+    XtCallbackProc *		/* callback */,

+    XtPointer *			/* closure */

+);

+

+extern void _XtCallConditionalCallbackList(

+    Widget			/* widget */,

+    XtCallbackList		/* callbacks */,

+    XtPointer			/* call_data */,

+    _XtConditionProc		/* cond_proc */

+);

+

+_XFUNCPROTOEND