summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--amiga/file.c1
-rw-r--r--amiga/gui.c1
-rwxr-xr-xamiga/history_local.c1
-rwxr-xr-xamiga/login.c1
-rw-r--r--atari/cookies.c1
-rw-r--r--atari/deskmenu.c19
-rwxr-xr-xatari/filetype.c1
-rwxr-xr-xatari/findfile.c1
-rw-r--r--atari/gui.c7
-rw-r--r--atari/history.c1
-rw-r--r--atari/hotlist.c1
-rwxr-xr-xatari/login.c1
-rwxr-xr-xatari/misc.c1
-rw-r--r--beos/fetch_rsrc.cpp1
-rw-r--r--cocoa/NetsurfApp.m1
-rw-r--r--content/fetchers/about.c1
-rw-r--r--content/fetchers/data.c1
-rw-r--r--content/fetchers/file.c1
-rw-r--r--content/fetchers/resource.c1
-rw-r--r--content/hlcache.c8
-rw-r--r--css/select.c8
-rw-r--r--desktop/browser.c1
-rw-r--r--desktop/tree.c1
-rw-r--r--framebuffer/Makefile.target3
-rw-r--r--framebuffer/misc.c1
-rw-r--r--gtk/gui.c1
-rw-r--r--gtk/login.c1
-rw-r--r--monkey/Makefile.target3
-rw-r--r--monkey/main.c1
-rw-r--r--render/box_construct.c1
-rw-r--r--render/html.c1
-rw-r--r--render/search.c1
-rw-r--r--riscos/401login.c1
-rw-r--r--riscos/cookies.c1
-rw-r--r--riscos/global_history.c1
-rw-r--r--riscos/history.c1
-rw-r--r--riscos/hotlist.c1
-rw-r--r--riscos/menus.c1
-rw-r--r--riscos/theme_install.c1
-rw-r--r--windows/findfile.c1
-rw-r--r--windows/main.c1
-rw-r--r--windows/misc.c1
42 files changed, 31 insertions, 53 deletions
diff --git a/amiga/file.c b/amiga/file.c
index 008141c42..acc1166e5 100644
--- a/amiga/file.c
+++ b/amiga/file.c
@@ -36,7 +36,6 @@
#include "desktop/save_text.h"
#include "utils/messages.h"
-#include "utils/url.h"
#include <proto/asl.h>
#include <proto/dos.h>
diff --git a/amiga/gui.c b/amiga/gui.c
index e254687ed..9acdafd6f 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -35,7 +35,6 @@
#include "utils/messages.h"
#include "utils/utf8.h"
#include "utils/utils.h"
-#include "utils/url.h"
#include "utils/file.h"
#include "content/fetchers/resource.h"
diff --git a/amiga/history_local.c b/amiga/history_local.c
index 4849c6560..9884ea3ec 100755
--- a/amiga/history_local.c
+++ b/amiga/history_local.c
@@ -32,7 +32,6 @@
#include "amiga/object.h"
#include "amiga/gui.h"
#include "utils/log.h"
-#include "utils/url.h"
#include "utils/utils.h"
#include <proto/intuition.h>
#include "amiga/history_local.h"
diff --git a/amiga/login.c b/amiga/login.c
index 05d5d2470..231550492 100755
--- a/amiga/login.c
+++ b/amiga/login.c
@@ -23,7 +23,6 @@
#include <proto/exec.h>
#include <proto/intuition.h>
#include <proto/utility.h>
-#include "utils/url.h"
#include "content/urldb.h"
#include "utils/messages.h"
#include "utils/errors.h"
diff --git a/atari/cookies.c b/atari/cookies.c
index d05707559..550d59ce1 100644
--- a/atari/cookies.c
+++ b/atari/cookies.c
@@ -35,7 +35,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
-#include "utils/url.h"
#include "atari/gui.h"
#include "atari/misc.h"
#include "atari/treeview.h"
diff --git a/atari/deskmenu.c b/atari/deskmenu.c
index 6a8376def..3d2c0222c 100644
--- a/atari/deskmenu.c
+++ b/atari/deskmenu.c
@@ -1,9 +1,26 @@
+/*
+ * Copyright 2010 Ole Loots <ole@monochrom.net>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#include <stdlib.h>
#include <cflib.h>
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/url.h"
#include "desktop/browser.h"
#include "desktop/browser_private.h"
#include "utils/nsoption.h"
diff --git a/atari/filetype.c b/atari/filetype.c
index 5e700a0c6..4ceff8030 100755
--- a/atari/filetype.c
+++ b/atari/filetype.c
@@ -23,7 +23,6 @@
#include "utils/messages.h"
#include "utils/utils.h"
-#include "utils/url.h"
#include "utils/log.h"
#include "content/fetch.h"
diff --git a/atari/findfile.c b/atari/findfile.c
index 7badc7149..57454661f 100755
--- a/atari/findfile.c
+++ b/atari/findfile.c
@@ -26,7 +26,6 @@
#include <curl/curl.h>
#include "utils/log.h"
-#include "utils/url.h"
#include "atari/gemtk/gemtk.h"
#include "atari/findfile.h"
#include "atari/gui.h"
diff --git a/atari/gui.c b/atari/gui.c
index 0979f2974..3796ae511 100644
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -16,9 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/*
- This File provides all the mandatory functions prefixed with gui_
-*/
+/**
+ * \file Provides all the mandatory functions prefixed with gui_ for atari
+ */
#include <sys/types.h>
#include <sys/stat.h>
@@ -30,7 +30,6 @@
#include <stdbool.h>
#include <hubbub/hubbub.h>
-#include "utils/url.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
diff --git a/atari/history.c b/atari/history.c
index 90ed0b8ae..5195eb0e9 100644
--- a/atari/history.c
+++ b/atari/history.c
@@ -37,7 +37,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
-#include "utils/url.h"
#include "atari/gui.h"
#include "atari/misc.h"
#include "atari/treeview.h"
diff --git a/atari/hotlist.c b/atari/hotlist.c
index b4e36ae1a..bfbe5cd36 100644
--- a/atari/hotlist.c
+++ b/atari/hotlist.c
@@ -36,7 +36,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
-#include "utils/url.h"
#include "atari/gui.h"
#include "atari/misc.h"
#include "atari/treeview.h"
diff --git a/atari/login.c b/atari/login.c
index 81636aebb..687512ed1 100755
--- a/atari/login.c
+++ b/atari/login.c
@@ -32,7 +32,6 @@
#include "utils/utils.h"
#include "utils/messages.h"
#include "utils/log.h"
-#include "utils/url.h"
#include "content/urldb.h"
#include "content/fetch.h"
#include "atari/misc.h"
diff --git a/atari/misc.c b/atari/misc.c
index 8f58f7fa9..35ef18e52 100755
--- a/atari/misc.c
+++ b/atari/misc.c
@@ -33,7 +33,6 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
#include "utils/utils.h"
-#include "utils/url.h"
#include "utils/log.h"
#include "content/fetch.h"
diff --git a/beos/fetch_rsrc.cpp b/beos/fetch_rsrc.cpp
index 08fc0c73c..887be7960 100644
--- a/beos/fetch_rsrc.cpp
+++ b/beos/fetch_rsrc.cpp
@@ -38,7 +38,6 @@ extern "C" {
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/url.h"
#include "utils/utils.h"
#include "utils/ring.h"
#include "utils/base64.h"
diff --git a/cocoa/NetsurfApp.m b/cocoa/NetsurfApp.m
index cab06a688..45d31a122 100644
--- a/cocoa/NetsurfApp.m
+++ b/cocoa/NetsurfApp.m
@@ -37,7 +37,6 @@
#import "desktop/textinput.h"
#import "desktop/tree.h"
#import "render/html.h"
-#import "utils/url.h"
#import "utils/filename.h"
#import "utils/log.h"
#import "utils/messages.h"
diff --git a/content/fetchers/about.c b/content/fetchers/about.c
index f0244a975..d6a8c202c 100644
--- a/content/fetchers/about.c
+++ b/content/fetchers/about.c
@@ -53,7 +53,6 @@
#include "utils/corestrings.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/url.h"
#include "utils/utils.h"
#include "utils/ring.h"
#include "image/image_cache.h"
diff --git a/content/fetchers/data.c b/content/fetchers/data.c
index e192812a7..f7ae17150 100644
--- a/content/fetchers/data.c
+++ b/content/fetchers/data.c
@@ -38,7 +38,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/url.h"
#include "utils/utils.h"
#include "utils/ring.h"
#include "utils/base64.h"
diff --git a/content/fetchers/file.c b/content/fetchers/file.c
index 93e3bf84c..7e7229649 100644
--- a/content/fetchers/file.c
+++ b/content/fetchers/file.c
@@ -49,7 +49,6 @@
#include "utils/errors.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/url.h"
#include "utils/utils.h"
#include "utils/ring.h"
#include "utils/file.h"
diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c
index a5c12bbdb..2b21fb730 100644
--- a/content/fetchers/resource.c
+++ b/content/fetchers/resource.c
@@ -46,7 +46,6 @@
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/url.h"
#include "utils/utils.h"
#include "utils/ring.h"
diff --git a/content/hlcache.c b/content/hlcache.c
index 16f9697ef..5a3cc8583 100644
--- a/content/hlcache.c
+++ b/content/hlcache.c
@@ -25,16 +25,16 @@
#include <string.h>
#include "desktop/gui_factory.h"
-#include "content/content.h"
-#include "content/hlcache.h"
-#include "content/mimesniff.h"
#include "utils/http.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/ring.h"
-#include "utils/url.h"
#include "utils/utils.h"
+#include "content/content.h"
+#include "content/mimesniff.h"
+#include "content/hlcache.h"
+
typedef struct hlcache_entry hlcache_entry;
typedef struct hlcache_retrieval_ctx hlcache_retrieval_ctx;
diff --git a/css/select.c b/css/select.c
index 885cdecfd..72f72d9b8 100644
--- a/css/select.c
+++ b/css/select.c
@@ -23,16 +23,16 @@
#include "content/content_protected.h"
#include "content/urldb.h"
-#include "css/internal.h"
-#include "css/select.h"
-#include "css/utils.h"
#include "desktop/system_colour.h"
#include "utils/nsoption.h"
#include "utils/corestrings.h"
#include "utils/log.h"
-#include "utils/url.h"
#include "utils/utils.h"
+#include "css/internal.h"
+#include "css/select.h"
+#include "css/utils.h"
+
#undef PRINT_NODE_BLOOM_DETAILS
static css_error node_name(void *pw, void *node, css_qname *qname);
diff --git a/desktop/browser.c b/desktop/browser.c
index b1e4b7594..01f57178d 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -63,7 +63,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/nsurl.h"
-#include "utils/url.h"
#include "utils/utils.h"
#include "utils/utf8.h"
diff --git a/desktop/tree.c b/desktop/tree.c
index 4611a7747..a17230bc5 100644
--- a/desktop/tree.c
+++ b/desktop/tree.c
@@ -36,7 +36,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
-#include "utils/url.h"
struct tree {
unsigned int flags; /* Tree flags */
diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target
index 52694d493..9632b56d4 100644
--- a/framebuffer/Makefile.target
+++ b/framebuffer/Makefile.target
@@ -46,8 +46,7 @@ CFLAGS += -std=c99 -g -Dsmall $(WARNFLAGS) \
-D_BSD_SOURCE \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200112L \
- $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl) \
- $(shell xml2-config --cflags)
+ $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl)
LDFLAGS += -lm -Wl,--whole-archive $(shell $(PKG_CONFIG) --libs libnsfb) -Wl,--no-whole-archive
diff --git a/framebuffer/misc.c b/framebuffer/misc.c
index f5ad045a0..0a45b2842 100644
--- a/framebuffer/misc.c
+++ b/framebuffer/misc.c
@@ -24,7 +24,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
-#include "utils/url.h"
void warn_user(const char *warning, const char *detail)
{
diff --git a/gtk/gui.c b/gtk/gui.c
index bae3568c6..3535fb8a9 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -59,7 +59,6 @@
#include "utils/filepath.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/url.h"
#include "utils/utf8.h"
#include "utils/utils.h"
#include "utils/file.h"
diff --git a/gtk/login.c b/gtk/login.c
index baf37d094..f98a78703 100644
--- a/gtk/login.c
+++ b/gtk/login.c
@@ -30,7 +30,6 @@
#include "desktop/browser.h"
#include "desktop/gui.h"
#include "utils/messages.h"
-#include "utils/url.h"
#include "utils/utils.h"
struct session_401 {
diff --git a/monkey/Makefile.target b/monkey/Makefile.target
index 7c0f167d3..1b0ec163d 100644
--- a/monkey/Makefile.target
+++ b/monkey/Makefile.target
@@ -44,8 +44,7 @@ MONKEYCFLAGS := -std=c99 -Dmonkey -Dnsmonkey \
$(WARNFLAGS) -g \
$(shell $(PKG_CONFIG) --cflags glib-2.0) \
$(shell $(PKG_CONFIG) --cflags libdom libcurl) \
- $(shell $(PKG_CONFIG) --cflags openssl) \
- $(shell xml2-config --cflags)
+ $(shell $(PKG_CONFIG) --cflags openssl)
MONKEYLDFLAGS := -lm $(shell $(PKG_CONFIG) --cflags --libs glib-2.0)
diff --git a/monkey/main.c b/monkey/main.c
index 96476d26a..53fda7021 100644
--- a/monkey/main.c
+++ b/monkey/main.c
@@ -27,7 +27,6 @@
#include "desktop/netsurf.h"
#include "utils/log.h"
#include "utils/filepath.h"
-#include "utils/url.h"
#include "monkey/poll.h"
#include "monkey/dispatch.h"
diff --git a/render/box_construct.c b/render/box_construct.c
index 699102563..ddb02e3e5 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -44,7 +44,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
-#include "utils/url.h"
#include "utils/utils.h"
#include "render/box.h"
diff --git a/render/html.c b/render/html.c
index 95037a2b4..212124028 100644
--- a/render/html.c
+++ b/render/html.c
@@ -35,7 +35,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
-#include "utils/url.h"
#include "utils/utf8.h"
#include "utils/utils.h"
#include "utils/nsoption.h"
diff --git a/render/search.c b/render/search.c
index 3bec9e199..00261a36a 100644
--- a/render/search.c
+++ b/render/search.c
@@ -29,7 +29,6 @@
#include "utils/config.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/url.h"
#include "utils/utils.h"
#include "content/content.h"
#include "content/hlcache.h"
diff --git a/riscos/401login.c b/riscos/401login.c
index e6772b820..367cfe090 100644
--- a/riscos/401login.c
+++ b/riscos/401login.c
@@ -32,7 +32,6 @@
#include "riscos/wimp_event.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/url.h"
#include "utils/utils.h"
#define ICON_401LOGIN_LOGIN 0
diff --git a/riscos/cookies.c b/riscos/cookies.c
index 0a1529737..b5e97f778 100644
--- a/riscos/cookies.c
+++ b/riscos/cookies.c
@@ -43,7 +43,6 @@
#include "riscos/wimp_event.h"
#include "utils/messages.h"
#include "utils/log.h"
-#include "utils/url.h"
#include "utils/utils.h"
static void ro_gui_cookies_toolbar_update_buttons(void);
diff --git a/riscos/global_history.c b/riscos/global_history.c
index 840271f93..5e9476ef8 100644
--- a/riscos/global_history.c
+++ b/riscos/global_history.c
@@ -44,7 +44,6 @@
#include "riscos/wimp_event.h"
#include "utils/messages.h"
#include "utils/log.h"
-#include "utils/url.h"
#include "utils/utils.h"
static void ro_gui_global_history_toolbar_update_buttons(void);
diff --git a/riscos/history.c b/riscos/history.c
index c5bdfcb62..8c096b88c 100644
--- a/riscos/history.c
+++ b/riscos/history.c
@@ -37,7 +37,6 @@
#include "riscos/wimp_event.h"
#include "riscos/wimputils.h"
#include "utils/log.h"
-#include "utils/url.h"
#include "utils/utils.h"
diff --git a/riscos/hotlist.c b/riscos/hotlist.c
index 14e90fbfa..3f4935164 100644
--- a/riscos/hotlist.c
+++ b/riscos/hotlist.c
@@ -39,7 +39,6 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
-#include "utils/url.h"
#include "utils/nsoption.h"
#include "riscos/gui.h"
diff --git a/riscos/menus.c b/riscos/menus.c
index 2ed06c37b..e7d809337 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -34,7 +34,6 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/url.h"
#include "utils/utils.h"
#include "utils/utf8.h"
#include "content/content.h"
diff --git a/riscos/theme_install.c b/riscos/theme_install.c
index 82377facf..598b55d41 100644
--- a/riscos/theme_install.c
+++ b/riscos/theme_install.c
@@ -34,7 +34,6 @@
#include "riscos/wimp_event.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/url.h"
#include "utils/utils.h"
diff --git a/windows/findfile.c b/windows/findfile.c
index a91125c59..bca115815 100644
--- a/windows/findfile.c
+++ b/windows/findfile.c
@@ -30,7 +30,6 @@
#include <curl/curl.h>
-#include "utils/url.h"
#include "utils/log.h"
#include "utils/utils.h"
#include "utils/filepath.h"
diff --git a/windows/main.c b/windows/main.c
index 22cb5207c..1fa713664 100644
--- a/windows/main.c
+++ b/windows/main.c
@@ -29,7 +29,6 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "utils/url.h"
#include "utils/filepath.h"
#include "content/fetchers/resource.h"
diff --git a/windows/misc.c b/windows/misc.c
index b60eb512c..3bf06f852 100644
--- a/windows/misc.c
+++ b/windows/misc.c
@@ -27,7 +27,6 @@
#include "utils/messages.h"
#include "utils/utils.h"
-#include "utils/url.h"
void warn_user(const char *warning, const char *detail)
{