Purge WITH_URI

svn path=/trunk/netsurf/; revision=6602

Docs/Doxyfile

@@ -894,7 +894,7 @@ INCLUDE_FILE_PATTERNS  =
 # or name=definition (no spaces). If the definition and the = are
 # omitted =1 is assumed.
 
-PREDEFINED             = riscos CSS_INTERNALS WITH_ARTWORKS WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_URI WITH_URL WITH_PDF_EXPORT
+PREDEFINED             = riscos CSS_INTERNALS WITH_ARTWORKS WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_URL WITH_PDF_EXPORT
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.

riscos/gui.c

@@ -82,9 +82,7 @@
 #include "riscos/textselection.h"
 #include "riscos/theme.h"
 #include "riscos/treeview.h"
-#ifdef WITH_URI
 #include "riscos/uri.h"
-#endif
 #ifdef WITH_URL
 #include "riscos/url_protocol.h"
 #endif
@@ -205,10 +203,8 @@ static wimp_MESSAGE_LIST(42) task_messages = { {
 	message_DRAG_CLAIM,
 	message_MODE_CHANGE,
 	message_FONT_CHANGED,
-#ifdef WITH_URI
 	message_URI_PROCESS,
 	message_URI_RETURN_RESULT,
-#endif
 #ifdef WITH_URL
 	message_INET_SUITE_OPEN_URL,
 #endif
@@ -1370,7 +1366,6 @@ void ro_gui_user_message(wimp_event_no event, wimp_message *message)
 			ro_gui_wimp_get_desktop_font();
 			break;
 
-#ifdef WITH_URI
 		case message_URI_PROCESS:
 			if (event != wimp_USER_MESSAGE_ACKNOWLEDGE)
 				ro_uri_message_received(message);
@@ -1378,7 +1373,6 @@ void ro_gui_user_message(wimp_event_no event, wimp_message *message)
 		case message_URI_RETURN_RESULT:
 			ro_uri_bounce(message);
 			break;
-#endif
 #ifdef WITH_URL
 		case message_INET_SUITE_OPEN_URL:
 			if (event == wimp_USER_MESSAGE_ACKNOWLEDGE) {

riscos/uri.c

@@ -17,7 +17,6 @@
  */
 
 #include "utils/config.h"
-#ifdef WITH_URI
 
 #include <stdbool.h>
 #include <stdio.h>
@@ -101,4 +100,3 @@ void ro_uri_bounce(wimp_message *msg)
 
 	return;
 }
-#endif

riscos/uri.h

@@ -20,7 +20,6 @@
 #define _NETSURF_RISCOS_URI_H_
 
 #include "utils/config.h"
-#ifdef WITH_URI
 
 #include "oslib/wimp.h"
 
@@ -28,6 +27,4 @@ void ro_uri_message_received(wimp_message *message);
 bool ro_uri_launch(char *uri);
 void ro_uri_bounce(wimp_message *message);
 
-#endif /* WITH_URI */
-
 #endif

utils/config.h

@@ -41,8 +41,6 @@ char *strndup(const char *s, size_t n);
 
 /* Platform specific features */
 #if defined(riscos)
-    /* Acorn URI protocol support */
-    #define WITH_URI
     /* ANT URL protocol support */
     #define WITH_URL
     /* Free text search */