diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-20 20:03:55 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-20 20:03:55 +0000 |
| commit | d0f7247ea67491b4bfae28cb90538b68c6f83d70 (patch) | |
| tree | 5a11197792c9d5a1279b38c5d24acdfa4b9dfa85 /amiga/stringview | |
| parent | 65ab38fc1c26bed356fc61dd4adfe1f0495fab65 (diff) | |
| parent | 2b9df1b2cd30e394ebb4e9be721b7d219c4e418c (diff) | |
| download | netsurf-d0f7247ea67491b4bfae28cb90538b68c6f83d70.tar.gz netsurf-d0f7247ea67491b4bfae28cb90538b68c6f83d70.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'amiga/stringview')
| -rwxr-xr-x | amiga/stringview/stringview.c | 4 | ||||
| -rw-r--r-- | amiga/stringview/urlhistory.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/amiga/stringview/stringview.c b/amiga/stringview/stringview.c index daabe58e0..a009f228a 100755 --- a/amiga/stringview/stringview.c +++ b/amiga/stringview/stringview.c @@ -667,7 +667,7 @@ static uint32 myStringClass_GM_HandleInput( Class *cl, Object *obj, struct gpInp myStringHandleListview( cl, obj ); break; } - +#ifdef __amigaos4__ case IECLASS_MOUSEWHEEL: { struct InputEvent *ie = msg->gpi_IEvent; @@ -686,7 +686,7 @@ static uint32 myStringClass_GM_HandleInput( Class *cl, Object *obj, struct gpInp retval = GMR_MEACTIVE; break; } - +#endif default: { retval = IDoSuperMethodA( cl, obj, (APTR)msg ); diff --git a/amiga/stringview/urlhistory.c b/amiga/stringview/urlhistory.c index 6d134a4a5..d55a4b4b6 100644 --- a/amiga/stringview/urlhistory.c +++ b/amiga/stringview/urlhistory.c @@ -33,6 +33,12 @@ static struct List PageList; +#ifdef __amigaos4__ +#define ALLOCVEC_SHARED(N) AllocVecTags((N), AVT_Type, MEMF_SHARED, TAG_DONE); +#else +#define ALLOCVEC_SHARED(N) AllocVec((N), MEMF_SHARED); +#endif + void URLHistory_Init( void ) { // Initialise page list @@ -79,17 +85,11 @@ static bool URLHistoryFound(nsurl *url, const struct url_data *data) /* skip this URL if it is already in the list */ if(URLHistory_FindPage(nsurl_access(url))) return true; - node = AllocVecTags(sizeof(struct Node), - AVT_Type, MEMF_SHARED, - //AVT_ClearWithValue, 0, - TAG_DONE); + node = ALLOCVEC_SHARED(sizeof(struct Node)); if ( node ) { - STRPTR urladd = (STRPTR) AllocVecTags( strlen ( nsurl_access(url) ) + 1, - AVT_Type, MEMF_SHARED, - //AVT_ClearWithValue, 0, - TAG_DONE); + STRPTR urladd = (STRPTR) ALLOCVEC_SHARED( strlen ( nsurl_access(url) ) + 1); if ( urladd ) { |