diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 21:12:31 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 21:12:31 +0000 |
| commit | 4f0c9b6c610d1eb9a5bcccf6dbf3f53410df9432 (patch) | |
| tree | 2b7be1c59b057b4c3dbc763291c5ad63ec7f3828 /frontends/amiga/bitmap.h | |
| parent | 2c6f2f4ef5a50c36676308f6663c0d21edc6aa70 (diff) | |
| parent | faf4c1fb6012941134046db14370f60748184b05 (diff) | |
| download | netsurf-4f0c9b6c610d1eb9a5bcccf6dbf3f53410df9432.tar.gz netsurf-4f0c9b6c610d1eb9a5bcccf6dbf3f53410df9432.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/malloc
Conflicts:
frontends/amiga/icon.c
Diffstat (limited to 'frontends/amiga/bitmap.h')
| -rwxr-xr-x | frontends/amiga/bitmap.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/frontends/amiga/bitmap.h b/frontends/amiga/bitmap.h index 771ded487..a32d740df 100755 --- a/frontends/amiga/bitmap.h +++ b/frontends/amiga/bitmap.h @@ -63,24 +63,24 @@ void ami_bitmap_set_url(struct bitmap *bm, struct nsurl *url); void ami_bitmap_set_title(struct bitmap *bm, const char *title); /** - * Get an icondata pointer + * Set an icondata pointer * * \param bm a bitmap, as returned by bitmap_create() - * \return pointer to the icondata area + * \param icondata a pointer to memory * * This function probably shouldn't be here! */ -ULONG *ami_bitmap_get_icondata(struct bitmap *bm); +void ami_bitmap_set_icondata(struct bitmap *bm, ULONG *icondata); /** - * Set an icondata pointer + * Free an icondata pointer * * \param bm a bitmap, as returned by bitmap_create() * \param icondata a pointer to memory * * This function probably shouldn't be here! */ -void ami_bitmap_set_icondata(struct bitmap *bm, ULONG *icondata); +void ami_bitmap_free_icondata(struct bitmap *bm); /** * Test if a BitMap is owned by a bitmap. |