diff options
| -rw-r--r-- | desktop/Makefile | 4 | ||||
| -rw-r--r-- | frontends/amiga/Makefile | 5 | ||||
| -rwxr-xr-x | frontends/amiga/cookies.h | 2 | ||||
| -rw-r--r-- | frontends/amiga/desktop-tree.c (renamed from desktop/tree.c) | 16 | ||||
| -rw-r--r-- | frontends/amiga/desktop-tree.h (renamed from desktop/tree.h) | 0 | ||||
| -rw-r--r-- | frontends/amiga/gui.c | 2 | ||||
| -rwxr-xr-x | frontends/amiga/history.h | 2 | ||||
| -rwxr-xr-x | frontends/amiga/tree.h | 2 | ||||
| -rw-r--r-- | test/llcache.c | 1 |
9 files changed, 17 insertions, 17 deletions
diff --git a/desktop/Makefile b/desktop/Makefile index f7f660d51..2dcd61611 100644 --- a/desktop/Makefile +++ b/desktop/Makefile @@ -2,8 +2,8 @@ S_DESKTOP := cookie_manager.c knockout.c hotlist.c mouse.c \ plot_style.c print.c search.c searchweb.c scrollbar.c \ - sslcert_viewer.c textarea.c tree.c version.c \ - system_colour.c global_history.c treeview.c + sslcert_viewer.c textarea.c version.c system_colour.c \ + global_history.c treeview.c S_DESKTOP := $(addprefix desktop/,$(S_DESKTOP)) diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index ea6e8fe67..f3c178ee6 100644 --- a/frontends/amiga/Makefile +++ b/frontends/amiga/Makefile @@ -37,7 +37,7 @@ MESSAGES_FILTER=ami # sources purely for the Amiga build S_FRONTEND := gui.c tree.c history.c hotlist.c schedule.c file.c \ - misc.c bitmap.c font.c filetype.c utf8.c login.c memory.c \ + misc.c bitmap.c font.c filetype.c utf8.c login.c memory.c \ plotters.c object.c menu.c save_pdf.c arexx.c version.c \ cookies.c ctxmenu.c clipboard.c help.c font_scan.c \ launch.c search.c history_local.c download.c iff_dr2d.c \ @@ -45,7 +45,8 @@ S_FRONTEND := gui.c tree.c history.c hotlist.c schedule.c file.c \ datatypes.c dt_picture.c dt_anim.c dt_sound.c plugin_hack.c \ stringview/stringview.c stringview/urlhistory.c rtg.c \ agclass/amigaguide_class.c os3support.c font_diskfont.c \ - selectmenu.c hash/xxhash.c font_cache.c font_bullet.c nsoption.c + selectmenu.c hash/xxhash.c font_cache.c font_bullet.c \ + nsoption.c desktop-tree.c # This is the final source build list # Note this is deliberately *not* expanded here as common and image diff --git a/frontends/amiga/cookies.h b/frontends/amiga/cookies.h index 85e553cb8..157091db9 100755 --- a/frontends/amiga/cookies.h +++ b/frontends/amiga/cookies.h @@ -18,7 +18,7 @@ #ifndef AMIGA_COOKIES_H #define AMIGA_COOKIES_H -#include "desktop/tree.h" +#include "amiga/desktop-tree.h" #include "amiga/tree.h" void ami_cookies_initialise(void); diff --git a/desktop/tree.c b/frontends/amiga/desktop-tree.c index b5f444ddb..3fb41edd5 100644 --- a/desktop/tree.c +++ b/frontends/amiga/desktop-tree.c @@ -31,12 +31,19 @@ #include "utils/messages.h" #include "utils/utils.h" #include "utils/nsoption.h" +#include "netsurf/misc.h" #include "netsurf/browser_window.h" #include "netsurf/core_window.h" #include "content/content.h" #include "content/hlcache.h" +#include "desktop/gui_internal.h" +#include "desktop/treeview.h" +#include "desktop/hotlist.h" +#include "desktop/cookie_manager.h" +#include "desktop/global_history.h" +#include "desktop/sslcert_viewer.h" -#include "desktop/tree.h" +#include "amiga/desktop-tree.h" struct tree { unsigned int flags; /* Tree flags */ @@ -45,13 +52,6 @@ struct tree { void *client_data; /* User assigned data for the callbacks */ }; -#include "netsurf/misc.h" -#include "desktop/gui_internal.h" -#include "desktop/treeview.h" -#include "desktop/hotlist.h" -#include "desktop/cookie_manager.h" -#include "desktop/global_history.h" -#include "desktop/sslcert_viewer.h" struct sslcert_session_data *ssl_current_session = NULL; const char *tree_hotlist_path = NULL; diff --git a/desktop/tree.h b/frontends/amiga/desktop-tree.h index f8864e167..f8864e167 100644 --- a/desktop/tree.h +++ b/frontends/amiga/desktop-tree.h diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index e835e2bd6..a51d8c2db 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -116,9 +116,9 @@ #include "desktop/save_complete.h" #include "desktop/scrollbar.h" #include "desktop/searchweb.h" -#include "desktop/tree.h" /* NetSurf Amiga platform includes */ +#include "amiga/desktop-tree.h" #include "amiga/gui.h" #include "amiga/arexx.h" #include "amiga/bitmap.h" diff --git a/frontends/amiga/history.h b/frontends/amiga/history.h index d20cfe0e1..47e00ed10 100755 --- a/frontends/amiga/history.h +++ b/frontends/amiga/history.h @@ -18,7 +18,7 @@ #ifndef AMIGA_HISTORY_H #define AMIGA_HISTORY_H -#include "desktop/tree.h" +#include "amiga/desktop-tree.h" #define GLOBAL_HISTORY_RECENT_URLS 16 diff --git a/frontends/amiga/tree.h b/frontends/amiga/tree.h index aa3c052e9..a8cada58d 100755 --- a/frontends/amiga/tree.h +++ b/frontends/amiga/tree.h @@ -22,7 +22,7 @@ #include <exec/types.h> #include <intuition/classusr.h> #include "amiga/os3support.h" -#include "desktop/tree.h" +#include "amiga/desktop-tree.h" struct treeview_window; diff --git a/test/llcache.c b/test/llcache.c index 8aae357b0..dbb6f29ee 100644 --- a/test/llcache.c +++ b/test/llcache.c @@ -109,7 +109,6 @@ char *url_to_path(const char *url) ******************************************************************************/ #include "desktop/cookie_manager.h" -#include "desktop/tree.h" /* desktop/cookie_manager.h -- used by urldb * |