diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-18 23:13:32 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-18 23:13:32 +0000 |
| commit | 201bc569a4f40b1b2e53660cceb183570534b557 (patch) | |
| tree | 7c0045a743c5a3ec58349a97e300c9e8a994a4e6 /amiga/stringview | |
| parent | 2eb41ed77b2deb3a1c54c7b6b94a7c31fb603714 (diff) | |
| download | netsurf-201bc569a4f40b1b2e53660cceb183570534b557.tar.gz netsurf-201bc569a4f40b1b2e53660cceb183570534b557.tar.bz2 | |
More OS3 compilation fixes
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 ) { |