From b90c05162b5edd08338a060f5777419654fa6d2e Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Wed, 26 Nov 2003 22:48:39 +0000 Subject: merge latest (4.3.99.16) from XFree86 (vendor) branch --- include/X11/Composite.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'include/X11/Composite.h') diff --git a/include/X11/Composite.h b/include/X11/Composite.h index 4c1e029..90a8ba4 100644 --- a/include/X11/Composite.h +++ b/include/X11/Composite.h @@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Composite.h,v 1.4 2003/10/24 15:47:35 tsi Exp $ */ #ifndef _XtComposite_h #define _XtComposite_h @@ -53,59 +54,45 @@ SOFTWARE. typedef struct _CompositeClassRec *CompositeWidgetClass; typedef Cardinal (*XtOrderProc)( -#if NeedFunctionPrototypes Widget /* child */ -#endif ); _XFUNCPROTOBEGIN extern void XtManageChildren( -#if NeedFunctionPrototypes WidgetList /* children */, Cardinal /* num_children */ -#endif ); extern void XtManageChild( -#if NeedFunctionPrototypes Widget /* child */ -#endif ); extern void XtUnmanageChildren( -#if NeedFunctionPrototypes WidgetList /* children */, Cardinal /* num_children */ -#endif ); extern void XtUnmanageChild( -#if NeedFunctionPrototypes Widget /* child */ -#endif ); typedef void (*XtDoChangeProc)( -#if NeedFunctionPrototypes Widget /* composite_parent */, WidgetList /* unmanage_children */, Cardinal * /* num_unmanage_children */, WidgetList /* manage_children */, Cardinal * /* num_manage_children */, XtPointer /* client_data */ -#endif ); extern void XtChangeManagedSet( -#if NeedFunctionPrototypes WidgetList /* unmanage_children */, Cardinal /* num_unmanage_children */, XtDoChangeProc /* do_change_proc */, XtPointer /* client_data */, WidgetList /* manage_children */, Cardinal /* num_manage_children */ -#endif ); _XFUNCPROTOEND -- cgit v1.2.3