summaryrefslogtreecommitdiff
path: root/css/css.h
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2003-04-05 21:38:06 +0000
committerJames Bursa <james@netsurf-browser.org>2003-04-05 21:38:06 +0000
commit2253e38be8cbcf4243e43fc0d317cfda08bffeb2 (patch)
tree2adcb8330dc2bb0a152a61733f1ec943984f2d53 /css/css.h
parent75768e67001bcf292f9e8bbbe8139a7432835092 (diff)
downloadnetsurf-2253e38be8cbcf4243e43fc0d317cfda08bffeb2.tar.gz
netsurf-2253e38be8cbcf4243e43fc0d317cfda08bffeb2.tar.bz2
[project @ 2003-04-05 21:38:06 by bursa]
External stylesheets. svn path=/import/netsurf/; revision=115
Diffstat (limited to 'css/css.h')
-rw-r--r--css/css.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/css/css.h b/css/css.h
index 78d0b8a56..a2ac5f4c7 100644
--- a/css/css.h
+++ b/css/css.h
@@ -1,5 +1,5 @@
/**
- * $Id: css.h,v 1.3 2003/04/05 16:24:43 bursa Exp $
+ * $Id: css.h,v 1.4 2003/04/05 21:38:06 bursa Exp $
*/
#ifndef _NETSURF_CSS_CSS_H_
@@ -136,7 +136,7 @@ struct node {
#include "netsurf/css/scanner.h"
-#define HASH_SIZE 47
+#define HASH_SIZE (47 + 1)
struct css_stylesheet {
yyscan_t lexer;
@@ -187,6 +187,7 @@ void css_parser_(void *yyp, int yymajor, char* yyminor,
void css_get_style(struct css_stylesheet * stylesheet, struct css_selector * selector,
unsigned int selectors, struct css_style * style);
void css_cascade(struct css_style * const style, const struct css_style * const apply);
+void css_merge(struct css_style * const style, const struct css_style * const apply);
void css_parse_property_list(struct css_style * style, char * str);
#endif