From 3abc932ff75f9aacc101ac101d48f73b2470f868 Mon Sep 17 00:00:00 2001 From: "Jason S. McMullan" Date: Tue, 3 Sep 2013 21:59:55 -0400 Subject: [PATCH] nlist.class: Compiler delint (x86_64) Signed-off-by: Jason S. McMullan --- AROS/workbench/classes/zune/nlist/nlist_mcc/NList_mcc.c | 8 ++++---- AROS/workbench/classes/zune/nlist/nlist_mcc/protos.h | 4 ++-- .../workbench/classes/zune/nlist/nlisttree_mcp/NListtree.c | 2 +- .../classes/zune/nlist/nlistviews_mcp/NListviews.c | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/AROS/workbench/classes/zune/nlist/nlist_mcc/NList_mcc.c b/AROS/workbench/classes/zune/nlist/nlist_mcc/NList_mcc.c index 54a288b..a74ad9b 100644 --- a/AROS/workbench/classes/zune/nlist/nlist_mcc/NList_mcc.c +++ b/AROS/workbench/classes/zune/nlist/nlist_mcc/NList_mcc.c @@ -240,17 +240,17 @@ HOOKPROTONHNO(NL_LayoutFuncGroup, ULONG, struct MUI_LayoutMsg *lm) MakeStaticHook(NL_LayoutHookGroup, NL_LayoutFuncGroup); -void release_pen(Object *obj, ULONG *pen) +void release_pen(Object *obj, IPTR *pen) { - if(*pen != (ULONG)-1) + if(*pen != (IPTR)-1) { MUI_ReleasePen(muiRenderInfo(obj), *pen); - *pen = (ULONG)-1; + *pen = (IPTR)-1; } } -void obtain_pen(Object *obj, ULONG *pen, struct MUI_PenSpec *ps) +void obtain_pen(Object *obj, IPTR *pen, struct MUI_PenSpec *ps) { release_pen(obj, pen); *pen = MUI_ObtainPen(muiRenderInfo(obj), ps, 0); diff --git a/AROS/workbench/classes/zune/nlist/nlist_mcc/protos.h b/AROS/workbench/classes/zune/nlist/nlist_mcc/protos.h index 106dadc..36da209 100644 --- a/AROS/workbench/classes/zune/nlist/nlist_mcc/protos.h +++ b/AROS/workbench/classes/zune/nlist/nlist_mcc/protos.h @@ -25,8 +25,8 @@ /* NList_mcc.c */ -extern void release_pen(Object *obj, ULONG *pen); -extern void obtain_pen(Object *obj, ULONG *pen, struct MUI_PenSpec *ps); +extern void release_pen(Object *obj, IPTR *pen); +extern void obtain_pen(Object *obj, IPTR *pen, struct MUI_PenSpec *ps); extern IPTR mNL_New(struct IClass *cl,Object *obj,struct opSet *msg); extern IPTR mNL_Dispose(struct IClass *cl,Object *obj,Msg msg); extern IPTR mNL_Setup(struct IClass *cl,Object *obj,struct MUIP_Setup *msg); diff --git a/AROS/workbench/classes/zune/nlist/nlisttree_mcp/NListtree.c b/AROS/workbench/classes/zune/nlist/nlisttree_mcp/NListtree.c index 27e850e..f1740fe 100644 --- a/AROS/workbench/classes/zune/nlist/nlisttree_mcp/NListtree.c +++ b/AROS/workbench/classes/zune/nlist/nlisttree_mcp/NListtree.c @@ -904,7 +904,7 @@ static IPTR _GadgetsToConfig( struct IClass *cl, Object *obj, struct MUIP_Settin { struct NListtreeP_Data *data = INST_DATA( cl, obj ); char buf[8]; - ULONG d=0; + IPTR d=0; ENTER(); diff --git a/AROS/workbench/classes/zune/nlist/nlistviews_mcp/NListviews.c b/AROS/workbench/classes/zune/nlist/nlistviews_mcp/NListviews.c index aad6f47..5081c81 100644 --- a/AROS/workbench/classes/zune/nlist/nlistviews_mcp/NListviews.c +++ b/AROS/workbench/classes/zune/nlist/nlistviews_mcp/NListviews.c @@ -130,8 +130,8 @@ Object *MakeCheck(STRPTR label, STRPTR help, ULONG check) #define LOAD_DATALONG(obj,attr,cfg_attr,defaultval) \ { \ - LONG *ptrd; \ - if((ptrd = (LONG *) DoMethod(msg->configdata, MUIM_Dataspace_Find, cfg_attr))) \ + IPTR *ptrd; \ + if((ptrd = (IPTR *) DoMethod(msg->configdata, MUIM_Dataspace_Find, cfg_attr))) \ set(obj, attr, *ptrd); \ else \ set(obj, attr, defaultval); \ @@ -139,14 +139,14 @@ Object *MakeCheck(STRPTR label, STRPTR help, ULONG check) #define SAVE_DATALONG(obj,attr,cfg_attr) \ { \ - LONG ptrd=0; \ + IPTR ptrd=0; \ get(obj, attr, &ptrd); \ DoMethod(msg->configdata, MUIM_Dataspace_Add, &ptrd, sizeof(ptrd), cfg_attr); \ } #define LOAD_DATASPEC(obj,attr,cfg_attr,defaultval) \ { \ - LONG ptrd; \ + IPTR ptrd; \ if((ptrd = DoMethod(msg->configdata, MUIM_Dataspace_Find, cfg_attr))) \ set(obj, attr, ptrd); \ else \ @@ -155,7 +155,7 @@ Object *MakeCheck(STRPTR label, STRPTR help, ULONG check) #define SAVE_DATASPEC(obj,attr,cfg_attr) \ { \ - LONG ptrd=0; \ + IPTR ptrd=0; \ get(obj, attr, &ptrd); \ if (ptrd) \ DoMethod(msg->configdata, MUIM_Dataspace_Add, ptrd, strlen((char *)ptrd)+1, cfg_attr); \ @@ -163,7 +163,7 @@ Object *MakeCheck(STRPTR label, STRPTR help, ULONG check) #define SAVE_DATASPEC2(obj,attr,cfg_attr) \ { \ - LONG ptrd=0; \ + IPTR ptrd=0; \ get(obj, attr, &ptrd); \ if (ptrd) \ DoMethod(msg->configdata, MUIM_Dataspace_Add, ptrd, strlen((char *)ptrd)+1, cfg_attr); \ @@ -171,7 +171,7 @@ Object *MakeCheck(STRPTR label, STRPTR help, ULONG check) #define LOAD_DATAFONT(obj,cfg_attr) \ { \ - LONG ptrd; \ + IPTR ptrd; \ if((ptrd = DoMethod(msg->configdata, MUIM_Dataspace_Find, cfg_attr))) \ set(obj, MUIA_String_Contents, ptrd); \ else \ -- 2.1.4