Solved runtime problems when compiled for 64-bit1.14.2.1

2 files changed, 325 insertions, 325 deletions

diff --git a/X11/Intrinsic.h b/X11/Intrinsic.h
index a117e5777..44a1b360a 100644
--- a/X11/Intrinsic.h
+++ b/X11/Intrinsic.h
@@ -153,7 +153,7 @@ typedef char*		XtArgVal;
 typedef long		XtEnum;

 #else

 typedef char		Boolean;

-typedef long		XtArgVal;

+typedef intptr_t	XtArgVal;

 typedef unsigned char	XtEnum;

 #endif

 

diff --git a/X11/IntrinsicP.h b/X11/IntrinsicP.h
index 3f0b251ac..d3007ee07 100644
--- a/X11/IntrinsicP.h
+++ b/X11/IntrinsicP.h
@@ -1,324 +1,324 @@
-/***********************************************************

-

-Copyright 1987, 1988, 1994, 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.

-

-******************************************************************/

-

-#ifndef _XtintrinsicP_h

-#define _XtintrinsicP_h

-

-#include <X11/Intrinsic.h>

-

-/*

- * Field sizes and offsets of XrmResource must match those of XtResource.

- * Type long is used instead of XrmQuark here because XrmQuark and String

- * are not the same size on all systems.

- */

-typedef struct {

-    long	xrm_name;	  /* Resource name quark		*/

-    long	xrm_class;	  /* Resource class quark		*/

-    long	xrm_type;	  /* Resource representation type quark */

-    Cardinal	xrm_size;	  /* Size in bytes of representation	*/

-    int		xrm_offset;	  /* -offset-1				*/

-    long	xrm_default_type; /* Default representation type quark	*/

-    XtPointer	xrm_default_addr; /* Default resource address		*/

-} XrmResource, *XrmResourceList;

-

-typedef unsigned long XtVersionType;

-

-#define XT_VERSION 11

-#ifndef XT_REVISION

-#define XT_REVISION 6

-#endif

-#define XtVersion (XT_VERSION * 1000 + XT_REVISION)

-#define XtVersionDontCheck 0

-

-typedef void (*XtProc)(

-    void

-);

-

-typedef void (*XtWidgetClassProc)(

-    WidgetClass /* class */

-);

-

-typedef void (*XtWidgetProc)(

-    Widget	/* widget */

-);

-

-typedef Boolean (*XtAcceptFocusProc)(

-    Widget	/* widget */,

-    Time*	/* time */

-);

-

-typedef void (*XtArgsProc)(

-    Widget	/* widget */,

-    ArgList	/* args */,

-    Cardinal*	/* num_args */

-);

-

-typedef void (*XtInitProc)(

-    Widget	/* request */,

-    Widget	/* new */,

-    ArgList	/* args */,

-    Cardinal*	/* num_args */

-);

-

-typedef Boolean (*XtSetValuesFunc)(

-    Widget 	/* old */,

-    Widget 	/* request */,

-    Widget 	/* new */,

-    ArgList 	/* args */,

-    Cardinal*	/* num_args */

-);

-

-typedef Boolean (*XtArgsFunc)(

-    Widget	/* widget */,

-    ArgList	/* args */,

-    Cardinal*	/* num_args */

-);

-

-typedef void (*XtAlmostProc)(

-    Widget		/* old */,

-    Widget		/* new */,

-    XtWidgetGeometry*	/* request */,

-    XtWidgetGeometry*	/* reply */

-);

-

-typedef void (*XtExposeProc)(

-    Widget	/* widget */,

-    XEvent*	/* event */,

-    Region	/* region */

-);

-

-/* compress_exposure options*/

-#define XtExposeNoCompress		((XtEnum)False)

-#define XtExposeCompressSeries		((XtEnum)True)

-#define XtExposeCompressMultiple	2

-#define XtExposeCompressMaximal		3

-

-/* modifiers */

-#define XtExposeGraphicsExpose	  	0x10

-#define XtExposeGraphicsExposeMerged	0x20

-#define XtExposeNoExpose	  	0x40

-#define XtExposeNoRegion		0x80

-

-typedef void (*XtRealizeProc)(

-    Widget 		  /* widget */,

-    XtValueMask* 	  /* mask */,

-    XSetWindowAttributes* /* attributes */

-);

-

-typedef XtGeometryResult (*XtGeometryHandler)(

-    Widget		/* widget */,

-    XtWidgetGeometry*	/* request */,

-    XtWidgetGeometry*	/* reply */

-);

-

-typedef void (*XtStringProc)(

-    Widget	/* widget */,

-    String	/* str */

-);

-

-typedef struct {

-    String	name;	/* resource name */

-    String	type;	/* representation type name */

-    XtArgVal	value;	/* representation */

-    int		size;	/* size of representation */

-} XtTypedArg, *XtTypedArgList;

-

-typedef void (*XtAllocateProc)(

-    WidgetClass		/* widget_class */,

-    Cardinal *		/* constraint_size */,

-    Cardinal *		/* more_bytes */,

-    ArgList		/* args */,

-    Cardinal *		/* num_args */,

-    XtTypedArgList	/* typed_args */,

-    Cardinal *		/* num_typed_args */,

-    Widget *		/* widget_return */,

-    XtPointer *		/* more_bytes_return */

-);

-

-typedef void (*XtDeallocateProc)(

-    Widget		/* widget */,

-    XtPointer		/* more_bytes */

-);

-

-struct _XtStateRec;	/* Forward declare before use for C++ */

-

-typedef struct _XtTMRec {

-    XtTranslations  translations;	/* private to Translation Manager    */

-    XtBoundActions  proc_table;		/* procedure bindings for actions    */

-    struct _XtStateRec *current_state;  /* Translation Manager state ptr     */

-    unsigned long   lastEventTime;

-} XtTMRec, *XtTM;

-

-#include <X11/CoreP.h>

-#include <X11/CompositeP.h>

-#include <X11/ConstrainP.h>

-#include <X11/ObjectP.h>

-#include <X11/RectObjP.h>

-

-#define XtDisplay(widget)	DisplayOfScreen((widget)->core.screen)

-#define XtScreen(widget)	((widget)->core.screen)

-#define XtWindow(widget)	((widget)->core.window)

-

-#define XtClass(widget)		((widget)->core.widget_class)

-#define XtSuperclass(widget)	(XtClass(widget)->core_class.superclass)

-#define XtIsRealized(object)	(XtWindowOfObject(object) != None)

-#define XtParent(widget)	((widget)->core.parent)

-

-#undef XtIsRectObj

-extern Boolean XtIsRectObj(Widget);

-#define XtIsRectObj(obj) \

-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x02)

-

-#undef XtIsWidget

-extern Boolean XtIsWidget(Widget);

-#define XtIsWidget(obj) \

-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x04)

-

-#undef XtIsComposite

-extern Boolean XtIsComposite(Widget);

-#define XtIsComposite(obj) \

-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x08)

-

-#undef XtIsConstraint

-extern Boolean XtIsConstraint(Widget);

-#define XtIsConstraint(obj) \

-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x10)

-

-#undef XtIsShell

-extern Boolean XtIsShell(Widget);

-#define XtIsShell(obj) \

-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x20)

-

-#undef XtIsWMShell

-extern Boolean XtIsWMShell(Widget);

-#define XtIsWMShell(obj) \

-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x40)

-

-#undef XtIsTopLevelShell

-extern Boolean XtIsTopLevelShell(Widget);

-#define XtIsTopLevelShell(obj) \

-    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x80)

-

-#ifdef DEBUG

-#define XtCheckSubclass(w, widget_class_ptr, message)	\

-	if (!XtIsSubclass(((Widget)(w)), (widget_class_ptr))) {	\

-	    String params[3];				\

-	    Cardinal num_params = 3;			\

-	    params[0] = ((Widget)(w))->core.widget_class->core_class.class_name;\

-	    params[1] = (widget_class_ptr)->core_class.class_name;	     \

-	    params[2] = (message);					     \

-	    XtAppErrorMsg(XtWidgetToApplicationContext((Widget)(w)),	     \

-		    "subclassMismatch", "xtCheckSubclass", "XtToolkitError", \

-		    "Widget class %s found when subclass of %s expected: %s",\

-		    params, &num_params);		\

-	}

-#else

-#define XtCheckSubclass(w, widget_class, message)	/* nothing */

-#endif

-

-_XFUNCPROTOBEGIN

-

-extern Widget _XtWindowedAncestor( /* internal; implementation-dependent */

-    Widget 		/* object */

-);

-

-extern void _XtInherit(

-    void

-);

-

-extern void _XtHandleFocus(

-    Widget		/* widget */,

-    XtPointer		/* client_data */,

-    XEvent *		/* event */,

-    Boolean *		/* cont */);

-

-extern void XtCreateWindow(

-    Widget 		/* widget */,

-    unsigned int 	/* window_class */,

-    Visual*		/* visual */,

-    XtValueMask		/* value_mask */,

-    XSetWindowAttributes* /* attributes */

-);

-

-extern void XtResizeWidget(

-    Widget 		/* widget */,

-    _XtDimension	/* width */,

-    _XtDimension	/* height */,

-    _XtDimension	/* border_width */

-);

-

-extern void XtMoveWidget(

-    Widget 		/* widget */,

-    _XtPosition		/* x */,

-    _XtPosition		/* y */

-);

-

-extern void XtConfigureWidget(

-    Widget 		/* widget */,

-    _XtPosition		/* x */,

-    _XtPosition		/* y */,

-    _XtDimension	/* width */,

-    _XtDimension	/* height */,

-    _XtDimension	/* border_width */

-);

-

-extern void XtResizeWindow(

-    Widget 		/* widget */

-);

-

-extern void XtProcessLock(

-    void

-);

-

-extern void XtProcessUnlock(

-    void

-);

-

-_XFUNCPROTOEND

-

-#endif /* _XtIntrinsicP_h */

-/* DON'T ADD STUFF AFTER THIS #endif */

+/***********************************************************
+
+Copyright 1987, 1988, 1994, 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.
+
+******************************************************************/
+
+#ifndef _XtintrinsicP_h
+#define _XtintrinsicP_h
+
+#include <X11/Intrinsic.h>
+
+/*
+ * Field sizes and offsets of XrmResource must match those of XtResource.
+ * Type intptr_t is used instead of XrmQuark here because XrmQuark and String
+ * are not the same size on all systems.
+ */
+typedef struct {
+    intptr_t	xrm_name;	  /* Resource name quark		*/
+    intptr_t	xrm_class;	  /* Resource class quark		*/
+    intptr_t	xrm_type;	  /* Resource representation type quark */
+    Cardinal	xrm_size;	  /* Size in bytes of representation	*/
+    int		xrm_offset;	  /* -offset-1				*/
+    intptr_t	xrm_default_type; /* Default representation type quark	*/
+    XtPointer	xrm_default_addr; /* Default resource address		*/
+} XrmResource, *XrmResourceList;
+
+typedef unsigned long XtVersionType;
+
+#define XT_VERSION 11
+#ifndef XT_REVISION
+#define XT_REVISION 6
+#endif
+#define XtVersion (XT_VERSION * 1000 + XT_REVISION)
+#define XtVersionDontCheck 0
+
+typedef void (*XtProc)(
+    void
+);
+
+typedef void (*XtWidgetClassProc)(
+    WidgetClass /* class */
+);
+
+typedef void (*XtWidgetProc)(
+    Widget	/* widget */
+);
+
+typedef Boolean (*XtAcceptFocusProc)(
+    Widget	/* widget */,
+    Time*	/* time */
+);
+
+typedef void (*XtArgsProc)(
+    Widget	/* widget */,
+    ArgList	/* args */,
+    Cardinal*	/* num_args */
+);
+
+typedef void (*XtInitProc)(
+    Widget	/* request */,
+    Widget	/* new */,
+    ArgList	/* args */,
+    Cardinal*	/* num_args */
+);
+
+typedef Boolean (*XtSetValuesFunc)(
+    Widget 	/* old */,
+    Widget 	/* request */,
+    Widget 	/* new */,
+    ArgList 	/* args */,
+    Cardinal*	/* num_args */
+);
+
+typedef Boolean (*XtArgsFunc)(
+    Widget	/* widget */,
+    ArgList	/* args */,
+    Cardinal*	/* num_args */
+);
+
+typedef void (*XtAlmostProc)(
+    Widget		/* old */,
+    Widget		/* new */,
+    XtWidgetGeometry*	/* request */,
+    XtWidgetGeometry*	/* reply */
+);
+
+typedef void (*XtExposeProc)(
+    Widget	/* widget */,
+    XEvent*	/* event */,
+    Region	/* region */
+);
+
+/* compress_exposure options*/
+#define XtExposeNoCompress		((XtEnum)False)
+#define XtExposeCompressSeries		((XtEnum)True)
+#define XtExposeCompressMultiple	2
+#define XtExposeCompressMaximal		3
+
+/* modifiers */
+#define XtExposeGraphicsExpose	  	0x10
+#define XtExposeGraphicsExposeMerged	0x20
+#define XtExposeNoExpose	  	0x40
+#define XtExposeNoRegion		0x80
+
+typedef void (*XtRealizeProc)(
+    Widget 		  /* widget */,
+    XtValueMask* 	  /* mask */,
+    XSetWindowAttributes* /* attributes */
+);
+
+typedef XtGeometryResult (*XtGeometryHandler)(
+    Widget		/* widget */,
+    XtWidgetGeometry*	/* request */,
+    XtWidgetGeometry*	/* reply */
+);
+
+typedef void (*XtStringProc)(
+    Widget	/* widget */,
+    String	/* str */
+);
+
+typedef struct {
+    String	name;	/* resource name */
+    String	type;	/* representation type name */
+    XtArgVal	value;	/* representation */
+    int		size;	/* size of representation */
+} XtTypedArg, *XtTypedArgList;
+
+typedef void (*XtAllocateProc)(
+    WidgetClass		/* widget_class */,
+    Cardinal *		/* constraint_size */,
+    Cardinal *		/* more_bytes */,
+    ArgList		/* args */,
+    Cardinal *		/* num_args */,
+    XtTypedArgList	/* typed_args */,
+    Cardinal *		/* num_typed_args */,
+    Widget *		/* widget_return */,
+    XtPointer *		/* more_bytes_return */
+);
+
+typedef void (*XtDeallocateProc)(
+    Widget		/* widget */,
+    XtPointer		/* more_bytes */
+);
+
+struct _XtStateRec;	/* Forward declare before use for C++ */
+
+typedef struct _XtTMRec {
+    XtTranslations  translations;	/* private to Translation Manager    */
+    XtBoundActions  proc_table;		/* procedure bindings for actions    */
+    struct _XtStateRec *current_state;  /* Translation Manager state ptr     */
+    unsigned long   lastEventTime;
+} XtTMRec, *XtTM;
+
+#include <X11/CoreP.h>
+#include <X11/CompositeP.h>
+#include <X11/ConstrainP.h>
+#include <X11/ObjectP.h>
+#include <X11/RectObjP.h>
+
+#define XtDisplay(widget)	DisplayOfScreen((widget)->core.screen)
+#define XtScreen(widget)	((widget)->core.screen)
+#define XtWindow(widget)	((widget)->core.window)
+
+#define XtClass(widget)		((widget)->core.widget_class)
+#define XtSuperclass(widget)	(XtClass(widget)->core_class.superclass)
+#define XtIsRealized(object)	(XtWindowOfObject(object) != None)
+#define XtParent(widget)	((widget)->core.parent)
+
+#undef XtIsRectObj
+extern Boolean XtIsRectObj(Widget);
+#define XtIsRectObj(obj) \
+    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x02)
+
+#undef XtIsWidget
+extern Boolean XtIsWidget(Widget);
+#define XtIsWidget(obj) \
+    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x04)
+
+#undef XtIsComposite
+extern Boolean XtIsComposite(Widget);
+#define XtIsComposite(obj) \
+    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x08)
+
+#undef XtIsConstraint
+extern Boolean XtIsConstraint(Widget);
+#define XtIsConstraint(obj) \
+    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x10)
+
+#undef XtIsShell
+extern Boolean XtIsShell(Widget);
+#define XtIsShell(obj) \
+    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x20)
+
+#undef XtIsWMShell
+extern Boolean XtIsWMShell(Widget);
+#define XtIsWMShell(obj) \
+    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x40)
+
+#undef XtIsTopLevelShell
+extern Boolean XtIsTopLevelShell(Widget);
+#define XtIsTopLevelShell(obj) \
+    (((Object)(obj))->object.widget_class->core_class.class_inited & 0x80)
+
+#ifdef DEBUG
+#define XtCheckSubclass(w, widget_class_ptr, message)	\
+	if (!XtIsSubclass(((Widget)(w)), (widget_class_ptr))) {	\
+	    String params[3];				\
+	    Cardinal num_params = 3;			\
+	    params[0] = ((Widget)(w))->core.widget_class->core_class.class_name;\
+	    params[1] = (widget_class_ptr)->core_class.class_name;	     \
+	    params[2] = (message);					     \
+	    XtAppErrorMsg(XtWidgetToApplicationContext((Widget)(w)),	     \
+		    "subclassMismatch", "xtCheckSubclass", "XtToolkitError", \
+		    "Widget class %s found when subclass of %s expected: %s",\
+		    params, &num_params);		\
+	}
+#else
+#define XtCheckSubclass(w, widget_class, message)	/* nothing */
+#endif
+
+_XFUNCPROTOBEGIN
+
+extern Widget _XtWindowedAncestor( /* internal; implementation-dependent */
+    Widget 		/* object */
+);
+
+extern void _XtInherit(
+    void
+);
+
+extern void _XtHandleFocus(
+    Widget		/* widget */,
+    XtPointer		/* client_data */,
+    XEvent *		/* event */,
+    Boolean *		/* cont */);
+
+extern void XtCreateWindow(
+    Widget 		/* widget */,
+    unsigned int 	/* window_class */,
+    Visual*		/* visual */,
+    XtValueMask		/* value_mask */,
+    XSetWindowAttributes* /* attributes */
+);
+
+extern void XtResizeWidget(
+    Widget 		/* widget */,
+    _XtDimension	/* width */,
+    _XtDimension	/* height */,
+    _XtDimension	/* border_width */
+);
+
+extern void XtMoveWidget(
+    Widget 		/* widget */,
+    _XtPosition		/* x */,
+    _XtPosition		/* y */
+);
+
+extern void XtConfigureWidget(
+    Widget 		/* widget */,
+    _XtPosition		/* x */,
+    _XtPosition		/* y */,
+    _XtDimension	/* width */,
+    _XtDimension	/* height */,
+    _XtDimension	/* border_width */
+);
+
+extern void XtResizeWindow(
+    Widget 		/* widget */
+);
+
+extern void XtProcessLock(
+    void
+);
+
+extern void XtProcessUnlock(
+    void
+);
+
+_XFUNCPROTOEND
+
+#endif /* _XtIntrinsicP_h */
+/* DON'T ADD STUFF AFTER THIS #endif */