From 56723e5898217cc10f808bad18bc39a4e5bcae79 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 13 Oct 2013 11:52:11 +0100 Subject: Use LIB_IS_AT_LEAST macro --- amiga/gui_options.c | 2 +- amiga/menu.c | 3 +-- amiga/theme.c | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'amiga') diff --git a/amiga/gui_options.c b/amiga/gui_options.c index 2a7b9f5f7..1bf20ad47 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -418,7 +418,7 @@ void ami_gui_opts_open(void) return; } - if(IntuitionBase->LibNode.lib_Version >= 53) ptr_disable = TRUE; + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 53, 42)) ptr_disable = TRUE; if(nsoption_charp(pubscreen_name)) { diff --git a/amiga/menu.c b/amiga/menu.c index 3e9cae5c4..0b93ade65 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -393,8 +393,7 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) } while((gwin->menutype[j] != NM_TITLE) && (gwin->menutype[j] != 0)); } - if((GadToolsBase->lib_Version > 53) || - ((GadToolsBase->lib_Version == 53) && (GadToolsBase->lib_Revision >= 6))) { + if(LIB_IS_AT_LEAST((struct Library *)GadToolsBase, 53, 6)) { /* GadTools 53.6+ only. For now we will only create the menu using label.image if there's a bitmap associated with the item. */ if((gwin->menuicon[i] != NULL) && (gwin->menulab[i] != NM_BARLABEL)) { diff --git a/amiga/theme.c b/amiga/theme.c index 0778e296e..03ce01aeb 100644 --- a/amiga/theme.c +++ b/amiga/theme.c @@ -218,7 +218,7 @@ void ami_update_pointer(struct Window *win, gui_pointer_shape shape) { if(drag_save_data) return; - if(IntuitionBase->LibNode.lib_Version >= 53) { + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 53, 42)) { BOOL ptr_delay = FALSE; if(shape == GUI_POINTER_WAIT) ptr_delay = TRUE; @@ -282,7 +282,7 @@ void gui_window_hide_pointer(struct gui_window *g) void ami_init_mouse_pointers(void) { - if(IntuitionBase->LibNode.lib_Version >= 53) return; + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 53, 42)) return; int i; struct RastPort mouseptr; @@ -400,7 +400,7 @@ void ami_init_mouse_pointers(void) void ami_mouse_pointers_free(void) { - if(IntuitionBase->LibNode.lib_Version >= 53) return; + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 53, 42)) return; int i; -- cgit v1.2.3