From b4666ad2904d5028c67a67476eb68815c425e9b6 Mon Sep 17 00:00:00 2001 From: mazze Date: Sat, 19 Aug 2017 14:02:40 +0000 Subject: [PATCH] rm_args[] are IPTR git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@54888 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- dopus/Program/buffers.c | 8 ++++---- dopus/Program/rexx.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dopus/Program/buffers.c b/dopus/Program/buffers.c index 61eae80cb..3b51e5d6c 100644 --- a/dopus/Program/buffers.c +++ b/dopus/Program/buffers.c @@ -463,10 +463,10 @@ int type; Arg2 = entry text Arg3 = userdata */ - msg->rm_Args[0]=(STRPTR)type; - msg->rm_Args[1]=entry->name; - msg->rm_Args[2]=entry->comment; - msg->rm_Args[3]=(STRPTR)entry->protection; + msg->rm_Args[0]=(IPTR)type; + msg->rm_Args[1]=(IPTR)entry->name; + msg->rm_Args[2]=(IPTR)entry->comment; + msg->rm_Args[3]=(IPTR)entry->protection; /* Fill in the message correctly. Arguments are integer/string/string/integer diff --git a/dopus/Program/rexx.c b/dopus/Program/rexx.c index 570e3bd0e..0a76504d7 100644 --- a/dopus/Program/rexx.c +++ b/dopus/Program/rexx.c @@ -99,7 +99,7 @@ int allfuncs; else if (RexxSysBase) { if (msg->rm_Node.mn_Node.ln_Type==NT_REPLYMSG) { if (msg->rm_Args[1]) rexx_msg_reply(msg); - DeleteArgstring(msg->rm_Args[0]); + DeleteArgstring((UBYTE*)msg->rm_Args[0]); DeleteRexxMsg(msg); --replies_pending; } @@ -136,7 +136,7 @@ D(bug("rexx.2.%s\n",commandlist[cmd].name)); } } if (!commandlist[cmd].name) { - rexx_command(msg->rm_Args[0],msg); + rexx_command((char *)msg->rm_Args[0],msg); dontreply=1; } } @@ -163,11 +163,11 @@ D(bug("send_rexx_command(%s)\n",command?command:"NULL")); if ((RexxMsg=(struct RexxMsg *) CreateRexxMsg(arexx_port,"dopus",str_arexx_portname)) && - (RexxMsg->rm_Args[0]=(STRPTR)CreateArgstring(command,(long)strlen(command)))) { + (RexxMsg->rm_Args[0]=(IPTR)CreateArgstring(command,(long)strlen(command)))) { RexxMsg->rm_Action=RXCOMM; - RexxMsg->rm_Args[1]=(STRPTR)replyfunc; - RexxMsg->rm_Args[2]=(STRPTR)msg; + RexxMsg->rm_Args[1]=(IPTR)replyfunc; + RexxMsg->rm_Args[2]=(IPTR)msg; RexxMsg->rm_Node.mn_Node.ln_Name="REXX"; Forbid(); @@ -178,7 +178,7 @@ D(bug("send_rexx_command(%s)\n",command?command:"NULL")); ++replies_pending; return(RexxMsg); } - else DeleteArgstring(RexxMsg->rm_Args[0]); + else DeleteArgstring((UBYTE *)RexxMsg->rm_Args[0]); } if (RexxMsg) DeleteRexxMsg(RexxMsg); return(NULL); -- 2.11.4.GIT