summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-06-06 16:10:47 +0100
committerVincent Sanders <vince@kyllikki.org>2016-06-06 16:10:47 +0100
commit0fad46cd0f21af5b896e7a6ee1f3b45fdf2a091a (patch)
tree281d5a2459a7916e4fa440365b42af027c69a548
parent9c8d60792f42b5dd6b56e38bfc10467d1a5d22a7 (diff)
downloadnetsurf-0fad46cd0f21af5b896e7a6ee1f3b45fdf2a091a.tar.gz
netsurf-0fad46cd0f21af5b896e7a6ee1f3b45fdf2a091a.tar.bz2
reduce unecessary usage of content headers
-rw-r--r--content/hlcache.h2
-rw-r--r--content/llcache.h2
-rw-r--r--frontends/gtk/gui.c1
-rw-r--r--frontends/gtk/print.c4
-rw-r--r--frontends/gtk/search.c5
-rw-r--r--frontends/gtk/tabs.c1
-rw-r--r--frontends/gtk/viewdata.c4
7 files changed, 6 insertions, 13 deletions
diff --git a/content/hlcache.h b/content/hlcache.h
index 0dd102062..3d9f41cdb 100644
--- a/content/hlcache.h
+++ b/content/hlcache.h
@@ -39,7 +39,7 @@ typedef struct hlcache_child_context {
} hlcache_child_context;
/** High-level cache event */
-typedef struct {
+typedef struct hlcache_event {
content_msg type; /**< Event type */
union content_msg_data data; /**< Event data */
} hlcache_event;
diff --git a/content/llcache.h b/content/llcache.h
index cce9a79bf..796db66f8 100644
--- a/content/llcache.h
+++ b/content/llcache.h
@@ -37,7 +37,7 @@ struct fetch_multipart_data;
typedef struct llcache_handle llcache_handle;
/** POST data object for low-level cache requests */
-typedef struct {
+typedef struct llcache_post_data {
enum {
LLCACHE_POST_URL_ENCODED,
LLCACHE_POST_MULTIPART
diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index 27b73b175..3c7cdeb24 100644
--- a/frontends/gtk/gui.c
+++ b/frontends/gtk/gui.c
@@ -39,7 +39,6 @@
#include "utils/file.h"
#include "utils/nsoption.h"
#include "content/fetchers.h"
-#include "content/hlcache.h"
#include "content/urldb.h"
#include "content/backing_store.h"
#include "netsurf/browser_window.h"
diff --git a/frontends/gtk/print.c b/frontends/gtk/print.c
index 17cb96f93..55dcf6390 100644
--- a/frontends/gtk/print.c
+++ b/frontends/gtk/print.c
@@ -33,8 +33,6 @@
#include "utils/log.h"
#include "utils/utils.h"
-#include "content/content.h"
-#include "content/hlcache.h"
#include "utils/nsoption.h"
#include "netsurf/plotters.h"
#include "desktop/print.h"
@@ -48,7 +46,7 @@
/* Globals */
cairo_t *gtk_print_current_cr;
static struct print_settings* settings;
-hlcache_handle *content_to_print;
+struct hlcache_handle *content_to_print;
static GdkRectangle cliprect;
static inline void nsgtk_print_set_colour(colour c)
diff --git a/frontends/gtk/search.c b/frontends/gtk/search.c
index 2c73814e3..298309679 100644
--- a/frontends/gtk/search.c
+++ b/frontends/gtk/search.c
@@ -28,12 +28,11 @@
#include "utils/config.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "content/content.h"
-#include "content/hlcache.h"
+#include "utils/nsurl.h"
+#include "netsurf/search.h"
#include "netsurf/browser_window.h"
#include "desktop/search.h"
#include "desktop/searchweb.h"
-#include "netsurf/search.h"
#include "gtk/warn.h"
#include "gtk/compat.h"
diff --git a/frontends/gtk/tabs.c b/frontends/gtk/tabs.c
index 56a1ed6a5..6adce3a06 100644
--- a/frontends/gtk/tabs.c
+++ b/frontends/gtk/tabs.c
@@ -22,7 +22,6 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
#include "netsurf/browser_window.h"
-#include "content/content.h"
#include "desktop/search.h"
#include "gtk/compat.h"
diff --git a/frontends/gtk/viewdata.c b/frontends/gtk/viewdata.c
index 90a2366e9..6ed9dd9ac 100644
--- a/frontends/gtk/viewdata.c
+++ b/frontends/gtk/viewdata.c
@@ -40,10 +40,8 @@
#include "utils/utils.h"
#include "utils/file.h"
#include "utils/filepath.h"
-
+#include "utils/nsurl.h"
#include "netsurf/browser_window.h"
-#include "content/hlcache.h"
-#include "content/content.h"
#include "gtk/warn.h"
#include "gtk/about.h"