diff options
-rw-r--r-- | css/css.c | 9 | ||||
-rw-r--r-- | css/css.h | 9 |
2 files changed, 10 insertions, 8 deletions
@@ -135,7 +135,7 @@ const struct css_style css_base_style = { 0x000000, { CSS_CONTENT_NORMAL, 0 }, { CSS_COUNTER_RESET_NONE, 0 }, - { CSS_COUNTER_INCREMENT_NONE, 0 }, + { CSS_COUNTER_INCREMENT_NONE, 0 }, CSS_CURSOR_AUTO, CSS_DIRECTION_LTR, CSS_DISPLAY_BLOCK, @@ -220,7 +220,7 @@ const struct css_style css_empty_style = { CSS_COLOR_NOT_SET, { CSS_CONTENT_NOT_SET, 0 }, { CSS_COUNTER_RESET_NOT_SET, 0 }, - { CSS_COUNTER_INCREMENT_NOT_SET, 0 }, + { CSS_COUNTER_INCREMENT_NOT_SET, 0 }, CSS_CURSOR_NOT_SET, CSS_DIRECTION_NOT_SET, CSS_DISPLAY_NOT_SET, @@ -306,7 +306,7 @@ const struct css_style css_blank_style = { CSS_COLOR_INHERIT, { CSS_CONTENT_NORMAL, 0 }, { CSS_COUNTER_RESET_NONE, 0 }, - { CSS_COUNTER_INCREMENT_NONE, 0 }, + { CSS_COUNTER_INCREMENT_NONE, 0 }, CSS_CURSOR_INHERIT, CSS_DIRECTION_INHERIT, CSS_DISPLAY_INLINE, @@ -2843,7 +2843,8 @@ unsigned int css_hash(const char *s, int length) * Convert a struct css_length to pixels. */ -float css_len2px(struct css_length * length, struct css_style * style) +float css_len2px(const struct css_length *length, + const struct css_style *style) { assert(!((length->unit == CSS_UNIT_EM || length->unit == CSS_UNIT_EX) && style == 0)); switch (length->unit) { @@ -129,7 +129,7 @@ struct css_counter_control { int value; struct css_counter_control *next; }; - + struct css_counter { char *name; css_list_style_type style; @@ -203,7 +203,7 @@ struct css_style { CSS_CONTENT_NOT_SET } type; struct css_content *content; } content; - + /* counter controls */ struct { enum { @@ -605,7 +605,7 @@ int css_tokenise(unsigned char **buffer, unsigned char *end, unsigned char **token_text); void css_parser_Trace(FILE *TraceFILE, char *zTracePrompt); -void *css_parser_Alloc(void *(*mallocProc)(/*size_t*/ int)); +void *css_parser_Alloc(void *(*mallocProc)(size_t)); void css_parser_Free(void *p, void (*freeProc)(void*)); void css_parser_(void *yyp, int yymajor, struct css_parser_token yyminor, struct css_parser_params *param); @@ -628,6 +628,7 @@ colour named_colour(const char *name); void css_dump_style(const struct css_style * const style); void css_dump_stylesheet(const struct css_stylesheet * stylesheet); -float css_len2px(struct css_length * length, struct css_style * style); +float css_len2px(const struct css_length *length, + const struct css_style *style); #endif |