Author: jmb Date: Sun Feb 22 09:19:06 2009 New Revision: 6603 URL: http://source.netsurf-browser.org?rev=6603&view=rev Log: Purge WITH_URL Modified: trunk/netsurf/Docs/Doxyfile trunk/netsurf/riscos/gui.c trunk/netsurf/riscos/url_protocol.c trunk/netsurf/riscos/url_protocol.h trunk/netsurf/utils/config.h Modified: trunk/netsurf/Docs/Doxyfile URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/Doxyfile?rev=6603&am... ============================================================================== --- trunk/netsurf/Docs/Doxyfile (original) +++ trunk/netsurf/Docs/Doxyfile Sun Feb 22 09:19:06 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_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_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=6603&... ============================================================================== --- trunk/netsurf/riscos/gui.c (original) +++ trunk/netsurf/riscos/gui.c Sun Feb 22 09:19:06 2009 @@ -83,9 +83,7 @@ #include "riscos/theme.h" #include "riscos/treeview.h" #include "riscos/uri.h" -#ifdef WITH_URL #include "riscos/url_protocol.h" -#endif #include "riscos/url_complete.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" @@ -205,9 +203,7 @@ message_FONT_CHANGED, message_URI_PROCESS, message_URI_RETURN_RESULT, -#ifdef WITH_URL message_INET_SUITE_OPEN_URL, -#endif #ifdef WITH_PLUGIN message_PLUG_IN_OPENING, message_PLUG_IN_CLOSED, @@ -1373,7 +1369,6 @@ case message_URI_RETURN_RESULT: ro_uri_bounce(message); break; -#ifdef WITH_URL case message_INET_SUITE_OPEN_URL: if (event == wimp_USER_MESSAGE_ACKNOWLEDGE) { ro_url_bounce(message); @@ -1382,7 +1377,6 @@ ro_url_message_received(message); } break; -#endif #ifdef WITH_PLUGIN case message_PLUG_IN_OPENING: plugin_opening(message); @@ -2319,10 +2313,8 @@ void gui_launch_url(const char *url) { -#ifdef WITH_URL /* Try ant broadcast first */ ro_url_broadcast(url); -#endif } Modified: trunk/netsurf/riscos/url_protocol.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/url_protocol.c?rev... ============================================================================== --- trunk/netsurf/riscos/url_protocol.c (original) +++ trunk/netsurf/riscos/url_protocol.c Sun Feb 22 09:19:06 2009 @@ -25,7 +25,6 @@ */ #include "utils/config.h" -#ifdef WITH_URL #define _GNU_SOURCE /* for strndup */ #include <ctype.h> @@ -205,4 +204,3 @@ ro_uri_launch(url_message->url); } -#endif Modified: trunk/netsurf/riscos/url_protocol.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/url_protocol.h?rev... ============================================================================== --- trunk/netsurf/riscos/url_protocol.h (original) +++ trunk/netsurf/riscos/url_protocol.h Sun Feb 22 09:19:06 2009 @@ -24,7 +24,6 @@ #define _NETSURF_RISCOS_URL_H_ #include "utils/config.h" -#ifdef WITH_URL #include "oslib/wimp.h" @@ -33,6 +32,4 @@ void ro_url_load(const char *url); void ro_url_bounce(wimp_message *message); -#endif /* WITH_URL */ - #endif Modified: trunk/netsurf/utils/config.h URL: http://source.netsurf-browser.org/trunk/netsurf/utils/config.h?rev=6603&a... ============================================================================== --- trunk/netsurf/utils/config.h (original) +++ trunk/netsurf/utils/config.h Sun Feb 22 09:19:06 2009 @@ -41,8 +41,6 @@ /* Platform specific features */ #if defined(riscos) - /* ANT URL protocol support */ - #define WITH_URL /* Free text search */ #define WITH_SEARCH /* Theme auto-install */