r3185 jmb - in /trunk/netsurf: debug/netsurfd.c makefile

Author: jmb Date: Wed Feb 21 21:23:01 2007 New Revision: 3185 URL: http://svn.semichrome.net?rev=3185&view=rev Log: Fix debug build. Modified: trunk/netsurf/debug/netsurfd.c trunk/netsurf/makefile Modified: trunk/netsurf/debug/netsurfd.c URL: http://svn.semichrome.net/trunk/netsurf/debug/netsurfd.c?rev=3185&r1=... ============================================================================== --- trunk/netsurf/debug/netsurfd.c (original) +++ trunk/netsurf/debug/netsurfd.c Wed Feb 21 21:23:01 2007 @@ -17,7 +17,9 @@ #include "netsurf/desktop/cookies.h" #include "netsurf/desktop/gui.h" #include "netsurf/desktop/options.h" +#include "netsurf/desktop/selection.h" #include "netsurf/desktop/textinput.h" +#include "netsurf/desktop/tree.h" #include "netsurf/image/bitmap.h" #include "netsurf/render/box.h" #include "netsurf/riscos/save_complete.h" @@ -81,7 +83,7 @@ 0, 0, true, false); if (c) { fetchcache_go(c, 0, callback, 0, 0, 1000, 1000, - 0, 0, true); + 0, 0, true, 0); done = c->status == CONTENT_STATUS_DONE; while (!done) fetch_poll(); @@ -193,14 +195,12 @@ void schedule_run(void) {} #endif -bool selection_highlighted(struct selection *s, struct box *box, +bool selection_highlighted(struct selection *s, unsigned start, unsigned end, unsigned *start_idx, unsigned *end_idx) { return false; } bool gui_search_term_highlighted(struct gui_window *g, unsigned start_offset, unsigned end_offset, unsigned *start_idx, unsigned *end_idx) { return false; } -const char *local_encoding_name(void) { return "ISO-8859-1"; } - struct caret ghost_caret; bool cookies_update(const char *domain, const struct cookie_data *data) Modified: trunk/netsurf/makefile URL: http://svn.semichrome.net/trunk/netsurf/makefile?rev=3185&r1=3184&... ============================================================================== --- trunk/netsurf/makefile (original) +++ trunk/netsurf/makefile Wed Feb 21 21:23:01 2007 @@ -26,14 +26,14 @@ table.o textplain.o # render/ OBJECTS_COMMON += filename.o hashtable.o messages.o talloc.o \ url.o utf8.o utils.o # utils/ -OBJECTS_COMMON += knockout.o options.o tree.o # desktop/ +OBJECTS_COMMON += knockout.o options.o tree.o version.o # desktop/ OBJECTS_IMAGE = bmp.o bmpread.o gif.o gifread.o ico.o jpeg.o \ mng.o # image/ OBJECTS_RISCOS = $(OBJECTS_COMMON) $(OBJECTS_IMAGE) OBJECTS_RISCOS += browser.o frames.o history_core.o netsurf.o \ - selection.o textinput.o version.o gesture_core.o # desktop/ + selection.o textinput.o gesture_core.o # desktop/ OBJECTS_RISCOS += 401login.o artworks.o assert.o awrender.o bitmap.o \ buffer.o cookies.o configure.o debugwin.o \ dialog.o download.o draw.o filetype.o font.o \ @@ -59,7 +59,6 @@ OBJECTS_DEBUGRO = $(OBJECTS_COMMON) $(OBJECTS_IMAGE) OBJECTS_DEBUGRO += netsurfd.o # debug/ -OBJECTS_DEBUGRO += version.o # desktop/ OBJECTS_DEBUGRO += artworks.o awrender.o bitmap.o draw.o \ filename.o filetype.o font.o gif.o gifread.o image.o \ jpeg.o palettes.o plotters.o save_complete.o schedule.o \ @@ -68,7 +67,7 @@ OBJECTS_GTK = $(OBJECTS_COMMON) $(OBJECTS_IMAGE) OBJECTS_GTK += filetyped.o # debug/ OBJECTS_GTK += browser.o frames.o history_core.o netsurf.o \ - selection.o textinput.o version.o gesture_core.o # desktop/ + selection.o textinput.o gesture_core.o # desktop/ OBJECTS_GTK += font_pango.o gtk_bitmap.o gtk_gui.o \ gtk_schedule.o gtk_thumbnail.o gtk_options.o \ gtk_plotters.o gtk_treeview.o gtk_scaffolding.o \