From abf1be31c067a5c3a1f1f6b341617b257c9192af Mon Sep 17 00:00:00 2001
From: Jay McCarthy <jay@racket-lang.org>
Date: Tue, 18 May 2010 09:55:41 -0500
Subject: [PATCH] correct int->ptr->int warning on 64bit

---
 src/wxxt/src/XWidgets/xwGroup.c  | 5 +++--
 src/wxxt/src/XWidgets/xwGroup.w  | 7 ++++---
 src/wxxt/src/XWidgets/xwGroupP.h | 3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/wxxt/src/XWidgets/xwGroup.c b/src/wxxt/src/XWidgets/xwGroup.c
index 83509b8c21..4ed61a9324 100644
--- a/src/wxxt/src/XWidgets/xwGroup.c
+++ b/src/wxxt/src/XWidgets/xwGroup.c
@@ -4,6 +4,7 @@
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <X11/Xmu/Converters.h>
 #include <X11/Xmu/CharSet.h>
 #include <xwToggle.h>
@@ -118,7 +119,7 @@ static void on_cb(toggle,client_data,call_data)Widget  toggle;XtPointer  client_
 #endif
 {
     Widget self = XtParent(toggle);
-    Cardinal toggle_ord = (Cardinal) client_data;
+    uintptr_t toggle_ord = (uintptr_t) client_data;
     Cardinal t, i, bits = sizeof(((XfwfGroupWidget)self)->xfwfGroup.selection) * 8;
 
     switch (((XfwfGroupWidget)self)->xfwfGroup.selectionStyle) {
@@ -150,7 +151,7 @@ static void off_cb(toggle,client_data,call_data)Widget  toggle;XtPointer  client
 #endif
 {
     Widget self = XtParent(toggle);
-    Cardinal toggle_ord = (Cardinal) client_data;
+    uintptr_t toggle_ord = (uintptr_t) client_data;
     Cardinal bits = sizeof(((XfwfGroupWidget)self)->xfwfGroup.selection) * 8;
 
     switch (((XfwfGroupWidget)self)->xfwfGroup.selectionStyle) {
diff --git a/src/wxxt/src/XWidgets/xwGroup.w b/src/wxxt/src/XWidgets/xwGroup.w
index 05286298b0..5ac24e5da9 100644
--- a/src/wxxt/src/XWidgets/xwGroup.w
+++ b/src/wxxt/src/XWidgets/xwGroup.w
@@ -139,7 +139,7 @@ visible.
 assigned to the next child that is a toggle button. The first toggle
 will be number 0.
 
-	@var Cardinal toggle_ord
+	@var uintptr_t toggle_ord
 
 @METHODS
 
@@ -290,7 +290,7 @@ callbacks are called.
 @proc on_cb(Widget toggle, XtPointer client_data, XtPointer call_data)
 {
     Widget $ = XtParent(toggle);
-    Cardinal toggle_ord = (Cardinal) client_data;
+    uintptr_t toggle_ord = (uintptr_t) client_data;
     Cardinal t, i, bits = sizeof($selection) * 8;
 
     switch ($selectionStyle) {
@@ -323,7 +323,7 @@ be turned off, except by turning on another one.
 @proc off_cb(Widget toggle, XtPointer client_data, XtPointer call_data)
 {
     Widget $ = XtParent(toggle);
-    Cardinal toggle_ord = (Cardinal) client_data;
+    uintptr_t toggle_ord = (uintptr_t) client_data;
     Cardinal bits = sizeof($selection) * 8;
 
     switch ($selectionStyle) {
@@ -443,6 +443,7 @@ two resources.
 @IMPORTS
 
 @incl <stdio.h>
+@incl <stdint.h>
 @incl <X11/Xmu/Converters.h>
 @incl <X11/Xmu/CharSet.h>
 @incl <xwToggle.h>
diff --git a/src/wxxt/src/XWidgets/xwGroupP.h b/src/wxxt/src/XWidgets/xwGroupP.h
index 8fb720baf0..14b4393537 100644
--- a/src/wxxt/src/XWidgets/xwGroupP.h
+++ b/src/wxxt/src/XWidgets/xwGroupP.h
@@ -5,6 +5,7 @@
 #define ___XWGROUPP_H
 #include <./xwRowColP.h>
 #include <./xwGroup.h>
+#include <stdint.h>
 _XFUNCPROTOBEGIN
 
 typedef struct {
@@ -33,7 +34,7 @@ long  selection;
 XtCallbackList  activate;
 /* private state */
 GC  textgc;
-Cardinal  toggle_ord;
+uintptr_t  toggle_ord;
 } XfwfGroupPart;
 
 typedef struct _XfwfGroupRec {