external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

dtcalc: resolve 13 compiler warnings on 64 bit builds.

Browse source
This commit is contained in:
Peter Howkins 2014-12-30 14:43:12 +00:00
parent 123d4ba8fc
commit 2fc7807ee5
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cde/programs/dtcalc/ds_widget.c
View file

@ -33,6 +33,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <limits.h> #include <limits.h>
#include "ds_widget.h" #include "ds_widget.h"

4
cde/programs/dtcalc/help.c
View file

@ -154,9 +154,9 @@ void
HelpRequestCB(Widget widget, caddr_t client_data, caddr_t call_data) HelpRequestCB(Widget widget, caddr_t client_data, caddr_t call_data)
{ {
char *helpVolume, *locationId; char *helpVolume, *locationId;
int topic; intptr_t topic;
topic = ((int) client_data) & 0xFFFF; topic = ((intptr_t) client_data) & 0xFFFF;
helpVolume = HELP_VOLUME; helpVolume = HELP_VOLUME;
if(topic < 56) if(topic < 56)

21
cde/programs/dtcalc/motif.c
View file

@ -401,7 +401,7 @@ static Widget
button_create(Widget owner, int row, int column, int maxrows, int maxcols) button_create(Widget owner, int row, int column, int maxrows, int maxcols)
{ {
int n = row * maxcols + column ; int n = row * maxcols + column ;
int val ; intptr_t val ;
enum menu_type mtype = buttons[n].mtype ; enum menu_type mtype = buttons[n].mtype ;
Widget button ; Widget button ;
XmString lstr ; XmString lstr ;
@ -577,7 +577,7 @@ dtcalc_initialize_rframe(Widget owner, int type)
button = XmCreatePushButton(form, "button", args, 11); button = XmCreatePushButton(form, "button", args, 11);
XmStringFree(label_string); XmStringFree(label_string);
XtAddCallback(button, XmNactivateCallback, close_reg, (XtPointer)type) ; XtAddCallback(button, XmNactivateCallback, close_reg, (XtPointer) (intptr_t) type) ;
XtSetArg (args[0], XmNcancelButton, button); XtSetArg (args[0], XmNcancelButton, button);
XtSetArg (args[1], XmNdefaultButton, button); XtSetArg (args[1], XmNdefaultButton, button);
@ -1340,7 +1340,8 @@ static void
create_menu(enum menu_type mtype, Widget button, int n) create_menu(enum menu_type mtype, Widget button, int n)
{ {
char *mstr, *tmpStr, *ptr ; char *mstr, *tmpStr, *ptr ;
int i, invalid, val ; int i, invalid ;
intptr_t val ;
Widget menu, mi ; Widget menu, mi ;
Boolean isAFunction = False; Boolean isAFunction = False;
@ -1409,7 +1410,7 @@ do_button(Widget widget, XtPointer client_data, XtPointer call_data)
char *str; char *str;
XmString cstr ; XmString cstr ;
Arg args[3]; Arg args[3];
int n = ((int) client_data) & 0xFFFF ; intptr_t n = ((intptr_t) client_data) & 0xFFFF ;
XtSetArg(args[0], XmNlabelString, &cstr); XtSetArg(args[0], XmNlabelString, &cstr);
XtGetValues(X->modevals[OPITEM], args, 1); XtGetValues(X->modevals[OPITEM], args, 1);
@ -1426,7 +1427,7 @@ do_button(Widget widget, XtPointer client_data, XtPointer call_data)
} }
ProcessMotifSelection(X->modevals[(int) DISPLAYITEM]); ProcessMotifSelection(X->modevals[(int) DISPLAYITEM]);
v->curwin = ((int) client_data) >> 16 ; v->curwin = ((intptr_t) client_data) >> 16 ;
if (v->pending) if (v->pending)
{ {
v->current = buttons[n].value ; v->current = buttons[n].value ;
@ -1511,7 +1512,7 @@ do_confirm_notice(Widget parent, char *str)
static void static void
close_reg(Widget widget, XtPointer client_data, XtPointer call_data) close_reg(Widget widget, XtPointer client_data, XtPointer call_data)
{ {
int type = (int)client_data; intptr_t type = (intptr_t)client_data;
if(type == MEM) if(type == MEM)
{ {
@ -2344,9 +2345,9 @@ menu_handler(Widget widget, XtPointer client_data, XEvent *event, Boolean *conti
void void
menu_proc(Widget widget, XtPointer client_data, XtPointer call_data) menu_proc(Widget widget, XtPointer client_data, XtPointer call_data)
{ {
int choice = ((int) client_data) & 0xFFFF ; intptr_t choice = ((intptr_t) client_data) & 0xFFFF ;
v->curwin = ((int) client_data) >> 16 ; v->curwin = ((intptr_t) client_data) >> 16 ;
handle_menu_selection(X->mrec[(int) X->mtype], choice) ; handle_menu_selection(X->mrec[(int) X->mtype], choice) ;
} }
@ -3584,7 +3585,7 @@ init_colors(void)
static void static void
do_memory(Widget w, XtPointer client_data, XtPointer call_data) do_memory(Widget w, XtPointer client_data, XtPointer call_data)
{ {
int type = (int)client_data; intptr_t type = (intptr_t)client_data;
if(type == MEM) if(type == MEM)
{ {
@ -3739,7 +3740,7 @@ void
move_cf(Widget widget, XtPointer client_data, XtPointer call_data) move_cf(Widget widget, XtPointer client_data, XtPointer call_data)
{ {
char *input; char *input;
int value; intptr_t value;
Arg args[3]; Arg args[3];
value = 0; value = 0;