From f0432b9f7b640ffcbfbfbe60643bd3f61f37c903 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Sun, 29 Mar 2009 00:22:20 +0000
Subject: Purge WITH_SAVE_COMPLETE

svn path=/trunk/netsurf/; revision=6979
---
 riscos/gui.c           | 2 --
 riscos/menus.c         | 2 --
 riscos/save.c          | 6 ------
 riscos/save_complete.c | 3 ---
 riscos/save_complete.h | 5 -----
 utils/config.h         | 1 -
 6 files changed, 19 deletions(-)

diff --git a/riscos/gui.c b/riscos/gui.c
index 446777f1a..ced9cfa14 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -423,9 +423,7 @@ void gui_init(int argc, char** argv)
 	filename_initialise();
 
 	/* Initialise save complete functionality */
-#ifdef WITH_SAVE_COMPLETE
 	save_complete_init();
-#endif
 
 	/* Initialise bitmap memory pool */
 	bitmap_initialise_memory();
diff --git a/riscos/menus.c b/riscos/menus.c
index 6f5d18075..12a8f4666 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -179,9 +179,7 @@ void ro_gui_menu_init(void)
 			{ "Page", BROWSER_PAGE, 0 },
 			{ "Page.PageInfo",BROWSER_PAGE_INFO, &dialog_pageinfo },
 			{ "Page.Save", BROWSER_SAVE, &dialog_saveas },
-#ifdef WITH_SAVE_COMPLETE
 			{ "Page.SaveComp", BROWSER_SAVE_COMPLETE, &dialog_saveas },
-#endif
 			{ "Page.Export", NO_ACTION, 0 },
 #ifdef WITH_DRAW_EXPORT
 			{ "Page.Export.Draw", BROWSER_EXPORT_DRAW, &dialog_saveas },
diff --git a/riscos/save.c b/riscos/save.c
index 5f48de22c..dc2cd2a93 100644
--- a/riscos/save.c
+++ b/riscos/save.c
@@ -845,7 +845,6 @@ bool ro_gui_save_content(struct content *c, char *path, bool force_overwrite)
 			save_as_text(c, path);
 			xosfile_set_type(path, 0xfff);
 			break;
-#ifdef WITH_SAVE_COMPLETE
 		case GUI_SAVE_COMPLETE:
 			assert(c);
 			if (c->type == CONTENT_HTML) {
@@ -859,7 +858,6 @@ bool ro_gui_save_content(struct content *c, char *path, bool force_overwrite)
 			else
 				gui_save_current_type = GUI_SAVE_OBJECT_ORIG;	/* \todo do this earlier? */
 			/* no break */
-#endif
 		case GUI_SAVE_SOURCE:
 		case GUI_SAVE_OBJECT_ORIG:
 			error = xosfile_save_stamped(path,
@@ -1001,8 +999,6 @@ void ro_gui_save_done(void)
 #define HEIGHT 64
 #define SPRITE_SIZE (16 + 44 + ((WIDTH / 2 + 3) & ~3) * HEIGHT / 2)
 
-#ifdef WITH_SAVE_COMPLETE
-
 bool ro_gui_save_complete(struct content *c, char *path)
 {
 	void *spr = ((byte *) saveas_area) + saveas_area->first;
@@ -1081,8 +1077,6 @@ bool ro_gui_save_complete(struct content *c, char *path)
 	return save_complete(c, path);
 }
 
-#endif
-
 bool ro_gui_save_object_native(struct content *c, char *path)
 {
 	switch (c->type) {
diff --git a/riscos/save_complete.c b/riscos/save_complete.c
index d03663ac8..0e9e3845d 100644
--- a/riscos/save_complete.c
+++ b/riscos/save_complete.c
@@ -22,7 +22,6 @@
  */
 
 #include "utils/config.h"
-#ifdef WITH_SAVE_COMPLETE
 
 #define _GNU_SOURCE /* for strndup */
 #include <assert.h>
@@ -755,5 +754,3 @@ bool save_complete_inventory(const char *path)
 	return true;
 }
 
-
-#endif
diff --git a/riscos/save_complete.h b/riscos/save_complete.h
index d04c4017a..63db0e44d 100644
--- a/riscos/save_complete.h
+++ b/riscos/save_complete.h
@@ -23,15 +23,10 @@
 #ifndef _NETSURF_RISCOS_SAVE_COMPLETE_H_
 #define _NETSURF_RISCOS_SAVE_COMPLETE_H_
 
-#include "utils/config.h"
-#ifdef WITH_SAVE_COMPLETE
-
 #include <stdbool.h>
 struct content;
 
 void save_complete_init(void);
 bool save_complete(struct content *c, const char *path);
 
-#endif /* WITH_SAVE_COMPLETE */
-
 #endif
diff --git a/utils/config.h b/utils/config.h
index a406e3f1e..e89bce1e5 100644
--- a/utils/config.h
+++ b/utils/config.h
@@ -56,7 +56,6 @@ char *strndup(const char *s, size_t n);
 #endif
 #if defined(riscos) || defined(DEBUG_BUILD)
     /* Export modules */
-    #define WITH_SAVE_COMPLETE
     #define WITH_DRAW_EXPORT
 #endif
 
-- 
cgit v1.2.3