diff options
author | Vincent Sanders <vince@kyllikki.org> | 2014-11-02 20:39:15 +0000 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2014-11-02 20:39:15 +0000 |
commit | 03abea12a76db9be29c6a56e453cadebc05983d6 (patch) | |
tree | 66c128fa9ccfe8538f6852a2fff2c7cb519cf59a | |
parent | ad343eccb18454bab2f4e9464b88564c9da69649 (diff) | |
download | netsurf-03abea12a76db9be29c6a56e453cadebc05983d6.tar.gz netsurf-03abea12a76db9be29c6a56e453cadebc05983d6.tar.bz2 |
fix errors introuced with previous header cleanup.
-rwxr-xr-x | amiga/hotlist.c | 1 | ||||
-rwxr-xr-x | amiga/hotlist.h | 6 | ||||
-rw-r--r-- | beos/scaffolding.h | 5 | ||||
-rw-r--r-- | cocoa/Tree.m | 1 | ||||
-rw-r--r-- | cocoa/coordinates.h | 1 | ||||
-rw-r--r-- | cocoa/plotter.m | 11 |
6 files changed, 18 insertions, 7 deletions
diff --git a/amiga/hotlist.c b/amiga/hotlist.c index 834587ef2..53b5b2c49 100755 --- a/amiga/hotlist.c +++ b/amiga/hotlist.c @@ -18,6 +18,7 @@ #include <proto/exec.h> +#include "utils/nsurl.h" #include "desktop/hotlist.h" #include "desktop/mouse.h" #include "desktop/gui_window.h" diff --git a/amiga/hotlist.h b/amiga/hotlist.h index 54f8a6350..c50ceecfb 100755 --- a/amiga/hotlist.h +++ b/amiga/hotlist.h @@ -18,13 +18,17 @@ #ifndef AMIGA_HOTLIST_H #define AMIGA_HOTLIST_H + #include "desktop/tree.h" #include "amiga/tree.h" +struct nsurl; + void ami_hotlist_initialise(const char *hotlist_file); void ami_hotlist_free(const char *hotlist_file); nserror ami_hotlist_scan(void *userdata, int first_item, const char *folder, - bool (*cb_add_item)(void *userdata, int level, int item, const char *title, nsurl *url, bool folder)); + bool (*cb_add_item)(void *userdata, int level, int item, const char *title, struct nsurl *url, bool folder)); struct treeview_window *hotlist_window; + #endif diff --git a/beos/scaffolding.h b/beos/scaffolding.h index c732bc9ed..0be619d74 100644 --- a/beos/scaffolding.h +++ b/beos/scaffolding.h @@ -26,6 +26,9 @@ extern "C" { #include "desktop/plotters.h" + +struct hlcache_handle; + } typedef struct beos_scaffolding nsbeos_scaffolding; @@ -201,7 +204,7 @@ void nsbeos_scaffolding_popup_menu(nsbeos_scaffolding *g, BPoint where); void gui_window_set_title(struct gui_window *_g, const char *title); nserror gui_window_set_url(struct gui_window *_g, const char *url); -void gui_window_set_icon(struct gui_window *_g, hlcache_handle *icon); +void gui_window_set_icon(struct gui_window *_g, struct hlcache_handle *icon); void gui_window_set_status(struct gui_window *_g, const char *text); void gui_window_start_throbber(struct gui_window* _g); void gui_window_stop_throbber(struct gui_window* _g); diff --git a/cocoa/Tree.m b/cocoa/Tree.m index 5e0247ad7..05a52c802 100644 --- a/cocoa/Tree.m +++ b/cocoa/Tree.m @@ -21,6 +21,7 @@ #import "cocoa/font.h" #import "cocoa/plotter.h" +#import "desktop/plotters.h" #import "desktop/tree.h" @implementation Tree diff --git a/cocoa/coordinates.h b/cocoa/coordinates.h index ff76ac976..d5504941a 100644 --- a/cocoa/coordinates.h +++ b/cocoa/coordinates.h @@ -19,6 +19,7 @@ #ifndef COCOA_COORDINATES_H #define COCOA_COORDINATES_H +#include "utils/utils.h" #import "desktop/browser.h" #import "render/box.h" diff --git a/cocoa/plotter.m b/cocoa/plotter.m index 4f63424e1..61f53c192 100644 --- a/cocoa/plotter.m +++ b/cocoa/plotter.m @@ -18,14 +18,15 @@ #include <Cocoa/Cocoa.h> -#import "cocoa/font.h" -#import "cocoa/plotter.h" -#import "cocoa/bitmap.h" - +#import "utils/log.h" +#import "utils/utils.h" #import "desktop/browser.h" #import "desktop/plotters.h" #import "desktop/plot_style.h" -#import "utils/log.h" + +#import "cocoa/font.h" +#import "cocoa/plotter.h" +#import "cocoa/bitmap.h" static void cocoa_plot_render_path(NSBezierPath *path,const plot_style_t *pstyle); static void cocoa_plot_path_set_stroke_pattern(NSBezierPath *path,const plot_style_t *pstyle); |