From ac636100e8d87a9e0080a258d90f1622bd1e5b8b Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 26 Feb 2015 16:58:41 +0000 Subject: Remove include of nsurl from corestrings.h --- content/dirlist.h | 8 +++++--- utils/corestrings.c | 1 + utils/corestrings.h | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/content/dirlist.h b/content/dirlist.h index 687f50688..5cdaf7532 100644 --- a/content/dirlist.h +++ b/content/dirlist.h @@ -33,15 +33,17 @@ #define DIRLIST_NO_DATE_COLUMN 1 << 3 #define DIRLIST_NO_TIME_COLUMN 1 << 4 +struct nsurl; + bool dirlist_generate_top(char *buffer, int buffer_length); bool dirlist_generate_hide_columns(int flags, char *buffer, int buffer_length); bool dirlist_generate_title(const char *title, char *buffer, int buffer_length); bool dirlist_generate_parent_link(const char *parent, char *buffer, int buffer_length); bool dirlist_generate_headings(char *buffer, int buffer_length); -bool dirlist_generate_row(bool even, bool directory, nsurl *url, char *name, - const char *mimetype, long long size, char *date, char *time, - char *buffer, int buffer_length); +bool dirlist_generate_row(bool even, bool directory, struct nsurl *url, + char *name, const char *mimetype, long long size, char *date, + char *time, char *buffer, int buffer_length); bool dirlist_generate_bottom(char *buffer, int buffer_length); #endif diff --git a/utils/corestrings.c b/utils/corestrings.c index 0f9c4d6ac..6e52a1b81 100644 --- a/utils/corestrings.c +++ b/utils/corestrings.c @@ -23,6 +23,7 @@ #include #include "utils/corestrings.h" +#include "utils/nsurl.h" #include "utils/utils.h" /* lwc_string strings */ diff --git a/utils/corestrings.h b/utils/corestrings.h index b55852900..d51e11cbb 100644 --- a/utils/corestrings.h +++ b/utils/corestrings.h @@ -24,7 +24,6 @@ #define NETSURF_UTILS_CORESTRINGS_H_ #include -#include "utils/nsurl.h" #include "utils/errors.h" /** File url prefix. */ @@ -289,6 +288,6 @@ extern struct dom_string *corestring_dom___ns_key_file_name_node_data; extern struct dom_string *corestring_dom___ns_key_image_coords_node_data; /* URLs */ -extern nsurl *corestring_nsurl_about_blank; +extern struct nsurl *corestring_nsurl_about_blank; #endif -- cgit v1.2.3