From 53482c68cf022df145bc0af0ad86d55501e06342 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 9 Nov 2014 19:44:59 +0000 Subject: Fix warnings --- amiga/download.h | 1 + amiga/iff_dr2d.c | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/amiga/download.h b/amiga/download.h index 41d4e556e..51981ede8 100755 --- a/amiga/download.h +++ b/amiga/download.h @@ -25,6 +25,7 @@ extern struct gui_download_table *amiga_download_table; struct download_context; struct gui_download_window; +struct gui_window; struct nsurl; struct dlnode diff --git a/amiga/iff_dr2d.c b/amiga/iff_dr2d.c index 5709d418b..54929da96 100644 --- a/amiga/iff_dr2d.c +++ b/amiga/iff_dr2d.c @@ -22,13 +22,19 @@ #include #include #include -#include "iff_dr2d.h" #include +#ifndef AMIGA_DR2D_STANDALONE +#include "amiga/iff_dr2d.h" +#include "content/hlcache.h" +#else +#include "iff_dr2d.h" +#endif + struct ColorRegister cm[1000]; ULONG numcols; -ULONG findcolour(ULONG newcol) +static ULONG findcolour(ULONG newcol) { ULONG i; ULONG colr = 0xFFFFFFFF; @@ -47,12 +53,9 @@ ULONG findcolour(ULONG newcol) return colr; } -void addcolour(ULONG newcol) +static void addcolour(ULONG newcol) { - ULONG colr; - UBYTE red,grn,blu; - - colr = findcolour(newcol); + ULONG colr = findcolour(newcol); if(colr == 0xFFFFFFFF) { @@ -309,10 +312,8 @@ bool ami_save_svg(struct hlcache_handle *c,char *filename) if(!ami_download_check_overwrite(filename, NULL, 0)) return false; - if(iffh = AllocIFF()) - { - if(iffh->iff_Stream = Open(filename,MODE_NEWFILE)) - { + if((iffh = AllocIFF())) { + if((iffh->iff_Stream = Open(filename,MODE_NEWFILE))) { InitIFFasDOS(iffh); } else return false; @@ -327,6 +328,7 @@ bool ami_save_svg(struct hlcache_handle *c,char *filename) if(iffh->iff_Stream) Close((BPTR)iffh->iff_Stream); if(iffh) FreeIFF(iffh); + return true; } #else /* -- cgit v1.2.3