summaryrefslogtreecommitdiff
path: root/include/X11/IntrinsicI.h
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:39 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:39 +0000
commitb90c05162b5edd08338a060f5777419654fa6d2e (patch)
tree346b8c7439d7d8db30404ad9f4db4c4e1725c252 /include/X11/IntrinsicI.h
parenta6bdd56c5b098599942e4091ae7e2af2d4631b44 (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'include/X11/IntrinsicI.h')
-rw-r--r--include/X11/IntrinsicI.h18
1 files changed, 2 insertions, 16 deletions
diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h
index d1e000c..6b0e8ef 100644
--- a/include/X11/IntrinsicI.h
+++ b/include/X11/IntrinsicI.h
@@ -46,7 +46,7 @@ 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 $ */
+/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.9 2003/04/21 16:34:28 herrb Exp $ */
#ifndef _XtintrinsicI_h
#define _XtintrinsicI_h
@@ -193,37 +193,27 @@ SOFTWARE.
extern String XtCXtToolkitError;
extern void _XtAllocError(
-#if NeedFunctionPrototypes
String /* alloc_type */
-#endif
);
extern void _XtCompileResourceList(
-#if NeedFunctionPrototypes
XtResourceList /* resources */,
Cardinal /* num_resources */
-#endif
);
extern XtGeometryResult _XtMakeGeometryRequest(
-#if NeedFunctionPrototypes
Widget /* widget */,
XtWidgetGeometry* /* request */,
XtWidgetGeometry* /* reply_return */,
Boolean* /* clear_rect_obj */
-#endif
);
extern Boolean _XtIsHookObject(
-#if NeedFunctionPrototypes
Widget /* widget */
-#endif
);
extern void _XtAddShellToHookObj(
-#if NeedFunctionPrototypes
Widget /* widget */
-#endif
);
/* GCManager.c */
@@ -233,7 +223,7 @@ extern void _XtGClistFree(Display *dpy, XtPerDisplay pd);
#ifdef XT_GEO_TATTLER
-extern void _XtGeoTab ();
+extern void _XtGeoTab (int);
extern void _XtGeoTrace (
Widget widget,
...
@@ -250,15 +240,11 @@ extern void _XtGeoTrace (
#ifndef XTTRACEMEMORY
extern char* __XtMalloc (
-#if NeedFunctionPrototypes
unsigned /* size */
-#endif
);
extern char* __XtCalloc (
-#if NeedFunctionPrototypes
unsigned /* num */,
unsigned /* size */
-#endif
);
#else