Author: jmb Date: Sun Feb 22 09:17:46 2009 New Revision: 6602 URL: http://source.netsurf-browser.org?rev=6602&view=rev Log: Purge WITH_URI Modified: trunk/netsurf/Docs/Doxyfile trunk/netsurf/riscos/gui.c trunk/netsurf/riscos/uri.c trunk/netsurf/riscos/uri.h trunk/netsurf/utils/config.h Modified: trunk/netsurf/Docs/Doxyfile URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/Doxyfile?rev=6602&am... ============================================================================== --- trunk/netsurf/Docs/Doxyfile (original) +++ trunk/netsurf/Docs/Doxyfile Sun Feb 22 09:17:46 2009 @@ -894,7 +894,7 @@ # 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. Modified: trunk/netsurf/riscos/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.c?rev=6602&... ============================================================================== --- trunk/netsurf/riscos/gui.c (original) +++ trunk/netsurf/riscos/gui.c Sun Feb 22 09:17:46 2009 @@ -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 @@ 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 @@ 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 @@ 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) { Modified: trunk/netsurf/riscos/uri.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/uri.c?rev=6602&... ============================================================================== --- trunk/netsurf/riscos/uri.c (original) +++ trunk/netsurf/riscos/uri.c Sun Feb 22 09:17:46 2009 @@ -17,7 +17,6 @@ */ #include "utils/config.h" -#ifdef WITH_URI #include <stdbool.h> #include <stdio.h> @@ -101,4 +100,3 @@ return; } -#endif Modified: trunk/netsurf/riscos/uri.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/uri.h?rev=6602&... ============================================================================== --- trunk/netsurf/riscos/uri.h (original) +++ trunk/netsurf/riscos/uri.h Sun Feb 22 09:17:46 2009 @@ -20,7 +20,6 @@ #define _NETSURF_RISCOS_URI_H_ #include "utils/config.h" -#ifdef WITH_URI #include "oslib/wimp.h" @@ -28,6 +27,4 @@ bool ro_uri_launch(char *uri); void ro_uri_bounce(wimp_message *message); -#endif /* WITH_URI */ - #endif Modified: trunk/netsurf/utils/config.h URL: http://source.netsurf-browser.org/trunk/netsurf/utils/config.h?rev=6602&a... ============================================================================== --- trunk/netsurf/utils/config.h (original) +++ trunk/netsurf/utils/config.h Sun Feb 22 09:17:46 2009 @@ -41,8 +41,6 @@ /* Platform specific features */ #if defined(riscos) - /* Acorn URI protocol support */ - #define WITH_URI /* ANT URL protocol support */ #define WITH_URL /* Free text search */