From 889ae885c66b0278c632090a0e1b89746a895ed4 Mon Sep 17 00:00:00 2001
From: James Bursa <james@netsurf-browser.org>
Date: Mon, 14 Jul 2003 22:57:45 +0000
Subject: [project @ 2003-07-14 22:57:45 by bursa] Add content instances.

svn path=/import/netsurf/; revision=216
---
 css/css.c     | 10 +++++-----
 css/css.h     |  2 +-
 css/makeenum  |  1 +
 css/ruleset.c |  2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'css')

diff --git a/css/css.c b/css/css.c
index 48dd28bee..8a29abb85 100644
--- a/css/css.c
+++ b/css/css.c
@@ -146,7 +146,7 @@ void css_revive(struct content *c, unsigned int width, unsigned int height)
 		c->data.css.import_content[i] = fetchcache(
 				c->data.css.import_url[i], c->url,
 				css_atimport_callback, c, i,
-				c->width, c->height, 0);
+				c->width, c->height);
 		if (c->data.css.import_content[i]->status != CONTENT_STATUS_DONE)
 			c->active++;
 	}
@@ -179,7 +179,7 @@ void css_destroy(struct content *c)
 		if (c->data.css.import_content[i] != 0) {
 			free(c->data.css.import_url[i]);
 			content_remove_user(c->data.css.import_content[i],
-					css_atimport_callback, c, i, 0);
+					css_atimport_callback, c, i);
 		}
 	xfree(c->data.css.import_url);
 	xfree(c->data.css.import_content);
@@ -295,7 +295,7 @@ void css_atimport(struct content *c, struct node *node)
 	c->data.css.import_url[i] = url_join(url, c->url);
 	c->data.css.import_content[i] = fetchcache(
 			c->data.css.import_url[i], c->url, css_atimport_callback,
-			c, i, c->width, c->height, 0);
+			c, i, c->width, c->height);
 	if (c->data.css.import_content[i]->status != CONTENT_STATUS_DONE)
 		c->active++;
 
@@ -311,7 +311,7 @@ void css_atimport_callback(content_msg msg, struct content *css,
 	switch (msg) {
 		case CONTENT_MSG_LOADING:
 			if (css->type != CONTENT_CSS) {
-				content_remove_user(css, css_atimport_callback, c, i, 0);
+				content_remove_user(css, css_atimport_callback, c, i);
 				c->data.css.import_content[i] = 0;
 				c->active--;
 				c->error = 1;
@@ -342,7 +342,7 @@ void css_atimport_callback(content_msg msg, struct content *css,
 			c->data.css.import_url[i] = xstrdup(error);
 			c->data.css.import_content[i] = fetchcache(
 					c->data.css.import_url[i], c->url, css_atimport_callback,
-					c, i, css->width, css->height, 0);
+					c, i, css->width, css->height);
 			if (c->data.css.import_content[i]->status != CONTENT_STATUS_DONE)
 				c->active++;
 			break;
diff --git a/css/css.h b/css/css.h
index 002c30fcd..08464c1e3 100644
--- a/css/css.h
+++ b/css/css.h
@@ -159,7 +159,7 @@ struct parse_params {
  * interface
  */
 
-#include "netsurf/content/content.h"
+struct content;
 
 void css_create(struct content *c);
 void css_process_data(struct content *c, char *data, unsigned long size);
diff --git a/css/makeenum b/css/makeenum
index 516e2c06b..4950cc14d 100755
--- a/css/makeenum
+++ b/css/makeenum
@@ -11,6 +11,7 @@ $out = shift or die "usage: makeenum leafname";
 open H, ">$out.h" or die "open 'enum.h' failed";
 open C, ">$out.c" or die "open 'enum.c' failed";
 
+print C "#include <string.h>\n";
 print C "#include \"$out.h\"\n\n";
 
 while (<>) {
diff --git a/css/ruleset.c b/css/ruleset.c
index 36e1a03cf..908b8a2f7 100644
--- a/css/ruleset.c
+++ b/css/ruleset.c
@@ -8,10 +8,10 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #define CSS_INTERNALS
 #define NDEBUG
 #include "netsurf/css/css.h"
+#include "netsurf/content/content.h"
 #include "netsurf/utils/log.h"
 #include "netsurf/utils/utils.h"
 
-- 
cgit v1.2.3