From 847b77628553c26679d0c18bbb0f376a957b20e3 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Sun, 22 Feb 2009 15:07:50 +0000
Subject: Purge NETSURF_USE_SSL and WITH_SSL

svn path=/trunk/netsurf/; revision=6599
---
 riscos/dialog.c   | 2 --
 riscos/gui.h      | 2 --
 riscos/plugin.c   | 4 ----
 riscos/sslcert.c  | 2 --
 riscos/treeview.c | 2 --
 5 files changed, 12 deletions(-)

(limited to 'riscos')

diff --git a/riscos/dialog.c b/riscos/dialog.c
index d9854f09e..ecc03b1e2 100644
--- a/riscos/dialog.c
+++ b/riscos/dialog.c
@@ -110,9 +110,7 @@ void ro_gui_dialog_init(void)
 #endif
 
 	/* certificate verification window */
-#ifdef WITH_SSL
 	ro_gui_cert_init();
-#endif
 
 	/* hotlist window */
 	ro_gui_hotlist_initialise();
diff --git a/riscos/gui.h b/riscos/gui.h
index 2ea3f5968..eb6c812e6 100644
--- a/riscos/gui.h
+++ b/riscos/gui.h
@@ -139,10 +139,8 @@ void ro_gui_401login_init(void);
 #endif
 
 /* in sslcert.c */
-#ifdef WITH_SSL
 void ro_gui_cert_init(void);
 void ro_gui_cert_open(struct tree *tree, struct node *node);
-#endif
 
 /* in window.c */
 void ro_gui_window_quit(void);
diff --git a/riscos/plugin.c b/riscos/plugin.c
index 2f93b7a86..742a099b7 100644
--- a/riscos/plugin.c
+++ b/riscos/plugin.c
@@ -1718,11 +1718,9 @@ void plugin_stream_callback(content_msg msg, struct content *c,
 			/* ignore this */
 			break;
 
-#ifdef WITH_SSL
 		case CONTENT_MSG_SSL:
 			plugin_destroy_stream(p, plugin_STREAM_DESTROY_ERROR);
 			break;
-#endif
 
 		case CONTENT_MSG_READY:
 		case CONTENT_MSG_DONE:
@@ -1770,9 +1768,7 @@ void plugin_fetch_callback(fetch_msg msg, void *p, const void *data,
 		case FETCH_TYPE:
 		case FETCH_NOTMODIFIED:
 		case FETCH_AUTH:
-#ifdef WITH_SSL
 		case FETCH_CERT_ERR:
-#endif
 		default:
 			/* not possible */
 			assert(0);
diff --git a/riscos/sslcert.c b/riscos/sslcert.c
index 51069954c..e588ba239 100644
--- a/riscos/sslcert.c
+++ b/riscos/sslcert.c
@@ -21,7 +21,6 @@
  */
 
 #include "utils/config.h"
-#ifdef WITH_SSL
 
 #include <assert.h>
 #include <stdbool.h>
@@ -446,4 +445,3 @@ bool ro_gui_cert_click(wimp_pointer *pointer)
 	return true;
 }
 
-#endif
diff --git a/riscos/treeview.c b/riscos/treeview.c
index 4a4ad36cf..8eac2abf6 100644
--- a/riscos/treeview.c
+++ b/riscos/treeview.c
@@ -1584,13 +1584,11 @@ bool ro_gui_tree_launch_node(struct tree *tree, struct node *node)
 		return true;
 	}
 
-#ifdef WITH_SSL
 	element = tree_find_element(node, TREE_ELEMENT_SSL);
 	if (element) {
 		ro_gui_cert_open(tree, node);
 		return true;
 	}
-#endif
 
 	return false;
 }
-- 
cgit v1.2.3