diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2009-02-22 15:17:46 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-02-22 15:17:46 +0000 |
| commit | 16a821e2aac8ca88083ffbcbaeeaf87126212421 (patch) | |
| tree | bc3a973680807ec8796dd934dba8ce241c488da1 | |
| parent | 851da107c9d0680336362478d6dcbe50efeaa5ab (diff) | |
| download | netsurf-16a821e2aac8ca88083ffbcbaeeaf87126212421.tar.gz netsurf-16a821e2aac8ca88083ffbcbaeeaf87126212421.tar.bz2 | |
Purge WITH_URI
svn path=/trunk/netsurf/; revision=6602
| -rw-r--r-- | Docs/Doxyfile | 2 | ||||
| -rw-r--r-- | riscos/gui.c | 6 | ||||
| -rw-r--r-- | riscos/uri.c | 2 | ||||
| -rw-r--r-- | riscos/uri.h | 3 | ||||
| -rw-r--r-- | utils/config.h | 2 |
5 files changed, 1 insertions, 14 deletions
diff --git a/Docs/Doxyfile b/Docs/Doxyfile index 4ff6d8981..5a7fa905f 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_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. diff --git a/riscos/gui.c b/riscos/gui.c index 49986cb7e..4a621c013 100644 --- a/riscos/gui.c +++ b/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) { diff --git a/riscos/uri.c b/riscos/uri.c index b4250941d..da6f951dc 100644 --- a/riscos/uri.c +++ b/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 diff --git a/riscos/uri.h b/riscos/uri.h index b22d36986..8165b9c61 100644 --- a/riscos/uri.h +++ b/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 diff --git a/utils/config.h b/utils/config.h index d3c9d2e83..03942acb8 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) - /* Acorn URI protocol support */ - #define WITH_URI /* ANT URL protocol support */ #define WITH_URL /* Free text search */ |