From 8e6013db174f6db3073de15b3d4388411256e39d Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sun, 2 Aug 2009 18:02:46 +0000 Subject: Use unsigned int for bitfields. Apparently, using uint32_t confuses some compilers. svn path=/trunk/libcss/; revision=8990 --- src/lex/lex.c | 4 ++-- src/parse/parse.c | 4 ++-- src/select/dispatch.h | 4 ++-- src/select/select.h | 8 ++++---- src/stylesheet.h | 14 +++++++------- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/lex/lex.c b/src/lex/lex.c index f2ec1c0..194161d 100644 --- a/src/lex/lex.c +++ b/src/lex/lex.c @@ -86,8 +86,8 @@ struct css_lexer * (used iff escapeSeen == true) */ - uint32_t state : 4, /**< Current state */ - substate : 4; /**< Current substate */ + unsigned int state : 4, /**< Current state */ + substate : 4; /**< Current substate */ struct { uint8_t first; /**< First character read for token */ diff --git a/src/parse/parse.c b/src/parse/parse.c index 60106a5..0d233cf 100644 --- a/src/parse/parse.c +++ b/src/parse/parse.c @@ -78,8 +78,8 @@ enum { */ typedef struct parser_state { - uint32_t state : 16; - uint32_t substate : 16; + unsigned int state : 16, + substate : 16; } parser_state; /** diff --git a/src/select/dispatch.h b/src/select/dispatch.h index a824d5e..9877458 100644 --- a/src/select/dispatch.h +++ b/src/select/dispatch.h @@ -37,8 +37,8 @@ extern struct prop_table { const css_computed_style *child, css_computed_style *result); - uint32_t inherited : 1, - group : 2; + unsigned int inherited : 1, + group : 2; } prop_dispatch[CSS_N_PROPERTIES]; #endif diff --git a/src/select/select.h b/src/select/select.h index 320efd0..8d940a0 100644 --- a/src/select/select.h +++ b/src/select/select.h @@ -17,10 +17,10 @@ typedef struct prop_state { uint32_t specificity; /* Specificity of property in result */ - uint32_t set : 1, /* Whether property is set in result */ - origin : 2, /* Origin of property in result */ - important : 1, /* Importance of property in result */ - inherit : 1; /* Property is set to inherit */ + unsigned int set : 1, /* Whether property is set in result */ + origin : 2, /* Origin of property in result */ + important : 1, /* Importance of property in result */ + inherit : 1; /* Property is set to inherit */ } prop_state; /** diff --git a/src/stylesheet.h b/src/stylesheet.h index 80b58b0..1769bff 100644 --- a/src/stylesheet.h +++ b/src/stylesheet.h @@ -53,9 +53,9 @@ typedef struct css_selector_detail { lwc_string *name; /**< Interned name */ lwc_string *value; /**< Interned value, or NULL */ - uint32_t type : 4, /**< Type of selector */ - comb : 2, /**< Type of combinator */ - next : 1; /**< Another selector detail + unsigned int type : 4, /**< Type of selector */ + comb : 2, /**< Type of combinator */ + next : 1; /**< Another selector detail * follows */ } css_selector_detail; @@ -95,10 +95,10 @@ struct css_rule { css_rule *next; /**< next in list */ css_rule *prev; /**< previous in list */ - uint32_t type : 4, /**< css_rule_type */ - index : 16, /**< index in sheet */ - items : 8, /**< # items in rule */ - ptype : 1; /**< css_rule_parent_type */ + unsigned int type : 4, /**< css_rule_type */ + index : 16, /**< index in sheet */ + items : 8, /**< # items in rule */ + ptype : 1; /**< css_rule_parent_type */ }; typedef struct css_rule_selector { -- cgit v1.2.3