summaryrefslogtreecommitdiff
path: root/xm.c
diff options
context:
space:
mode:
authorIOhannes m zmölnig <zmoelnig@iem.at>2017-01-23 13:23:12 +0100
committerIOhannes m zmölnig <zmoelnig@iem.at>2017-01-23 13:23:12 +0100
commite56861860a027030bb6d8386ba25f95a057bccdd (patch)
tree952f78b2c7b2dc0925d69df7236358c0af294065 /xm.c
parent0b84e302c3cc5e4456ca13b292750f0ae63406bc (diff)
New upstream version 17.1
Diffstat (limited to 'xm.c')
-rw-r--r--xm.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/xm.c b/xm.c
index ab48900..8471350 100644
--- a/xm.c
+++ b/xm.c
@@ -13,10 +13,12 @@
#define HAVE_XP 0
-#define XM_DATE "29-Oct-15"
+#define XM_DATE "27-Dec-16"
/* HISTORY:
*
+ * 27-Dec-16: changed XmNuserData type (in XtGetValues) to long long int.
+ * --------
* 29-Oct-15: removed ->string.
* --------
* 6-Mar: more macro name changes.
@@ -2192,7 +2194,8 @@ static Xen C_to_Xen_ANY(Widget w, Arg arg)
{
case XM_INT: return(C_int_to_Xen_integer((*((int *)(arg.value)))));
case XM_ULONG: return(C_ulong_to_Xen_ulong((*((unsigned long *)(arg.value)))));
- case XM_XTPOINTER: return(Xen_wrap_C_pointer((XtPointer)(arg.value)));
+ case XM_XTPOINTER: /* return(Xen_wrap_C_pointer((XtPointer)(arg.value))); */ /* a c-pointer is not useful in this context */
+ return(C_llong_to_Xen_llong(*((long long int *)(arg.value)))); /* this also seems to work in 32-bit systems */
case XM_UCHAR: return(C_int_to_Xen_integer((*((unsigned char *)(arg.value)))));
case XM_FLOAT: return(C_double_to_Xen_real((*((float *)(arg.value))))); /* the resource values are floats */
case XM_STRING: return(C_string_to_Xen_string((char *)(*((char **)(arg.value)))));