diff options
| -rw-r--r-- | Docs/Doxyfile | 2 | ||||
| -rw-r--r-- | riscos/gui.c | 8 | ||||
| -rw-r--r-- | riscos/url_protocol.c | 2 | ||||
| -rw-r--r-- | riscos/url_protocol.h | 3 | ||||
| -rw-r--r-- | utils/config.h | 2 |
5 files changed, 1 insertions, 16 deletions
diff --git a/Docs/Doxyfile b/Docs/Doxyfile index 5a7fa905f..c74b6d989 100644 --- a/Docs/Doxyfile +++ b/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_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. diff --git a/riscos/gui.c b/riscos/gui.c index 4a621c013..5530a8965 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -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 @@ static wimp_MESSAGE_LIST(42) task_messages = { { 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 @@ void ro_gui_user_message(wimp_event_no event, wimp_message *message) 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 @@ void ro_gui_user_message(wimp_event_no event, wimp_message *message) ro_url_message_received(message); } break; -#endif #ifdef WITH_PLUGIN case message_PLUG_IN_OPENING: plugin_opening(message); @@ -2319,10 +2313,8 @@ void ro_gui_dump_content(struct content *content) void gui_launch_url(const char *url) { -#ifdef WITH_URL /* Try ant broadcast first */ ro_url_broadcast(url); -#endif } diff --git a/riscos/url_protocol.c b/riscos/url_protocol.c index 57409d25f..5e0d70574 100644 --- a/riscos/url_protocol.c +++ b/riscos/url_protocol.c @@ -25,7 +25,6 @@ */ #include "utils/config.h" -#ifdef WITH_URL #define _GNU_SOURCE /* for strndup */ #include <ctype.h> @@ -205,4 +204,3 @@ void ro_url_bounce(wimp_message *message) ro_uri_launch(url_message->url); } -#endif diff --git a/riscos/url_protocol.h b/riscos/url_protocol.h index 0561d52dc..c066981f7 100644 --- a/riscos/url_protocol.h +++ b/riscos/url_protocol.h @@ -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_broadcast(const char *url); void ro_url_load(const char *url); void ro_url_bounce(wimp_message *message); -#endif /* WITH_URL */ - #endif diff --git a/utils/config.h b/utils/config.h index 03942acb8..e562dfe62 100644 --- a/utils/config.h +++ b/utils/config.h @@ -41,8 +41,6 @@ char *strndup(const char *s, size_t n); /* Platform specific features */ #if defined(riscos) - /* ANT URL protocol support */ - #define WITH_URL /* Free text search */ #define WITH_SEARCH /* Theme auto-install */ |