From 88711495858ead8749bfcf4c08e1da49a671dd43 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Tue, 31 Mar 2015 22:48:27 +0100 Subject: [PATCH] Remove inclusion of my async backing store code whilst it's not being used. --- amiga/Makefile.defaults | 5 +++++ amiga/Makefile.target | 3 +-- amiga/fs_backing_store.h | 1 + amiga/gui.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/amiga/Makefile.defaults b/amiga/Makefile.defaults index e226889bd..cfd6a7629 100644 --- a/amiga/Makefile.defaults +++ b/amiga/Makefile.defaults @@ -36,6 +36,11 @@ NETSURF_USE_NSSVG := YES # Valid options: NO NETSURF_USE_JS := NO +# Enable building the source object cache filesystem based backing store. +# implementation. +# Valid options: YES, NO +NETSURF_FS_BACKING_STORE := YES + # Optimisation levels CFLAGS += -fomit-frame-pointer -gstabs diff --git a/amiga/Makefile.target b/amiga/Makefile.target index 215ee097a..bca0c304f 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -74,8 +74,7 @@ S_AMIGA := gui.c tree.c history.c hotlist.c schedule.c file.c \ sslcert.c gui_options.c print.c theme.c drag.c icon.c libs.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 fs_backing_store.c os3support.c \ - font_bitmap.c + agclass/amigaguide_class.c os3support.c font_bitmap.c S_AMIGA := $(addprefix amiga/,$(S_AMIGA)) # This is the final source build list diff --git a/amiga/fs_backing_store.h b/amiga/fs_backing_store.h index 89a67fb79..45aa39578 100644 --- a/amiga/fs_backing_store.h +++ b/amiga/fs_backing_store.h @@ -19,5 +19,6 @@ #ifndef AMIGA_FS_BACKING_STORE_H #define AMIGA_FS_BACKING_STORE_H extern struct gui_llcache_table *amiga_filesystem_llcache_table; +extern struct gui_llcache_table *filesystem_llcache_table; #endif diff --git a/amiga/gui.c b/amiga/gui.c index 70982034e..dd067710a 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -5409,7 +5409,7 @@ int main(int argc, char** argv) .utf8 = amiga_utf8_table, .search = amiga_search_table, .search_web = &amiga_search_web_table, - .llcache = amiga_filesystem_llcache_table, + .llcache = filesystem_llcache_table, }; #ifdef __amigaos4__