Hack around platform headers doing the likes of typedef float FLOAT;

svn path=/trunk/libcss/; revision=11138

5 files changed, 14 insertions, 13 deletions

diff --git a/src/parse/language.c b/src/parse/language.c
index 9605e5f..739eba5 100644
--- a/src/parse/language.c
+++ b/src/parse/language.c
@@ -405,8 +405,9 @@ css_error handleStartAtRule(css_language *c, const parserutils_vector *vector)
 		} else {
 			return CSS_INVALID;
 		}
-	} else if (lwc_string_caseless_isequal(atkeyword->idata, c->strings[IMPORT], 
-			&match) == lwc_error_ok && match) {
+	} else if (lwc_string_caseless_isequal(atkeyword->idata, 
+			c->strings[LIBCSS_IMPORT], &match) == lwc_error_ok && 
+			match) {
 		if (c->state != HAD_RULE) {
 			lwc_string *url;
 			uint64_t media = 0;
diff --git a/src/parse/properties/border_outline.c b/src/parse/properties/border_outline.c
index be6cafd..02d85a7 100644
--- a/src/parse/properties/border_outline.c
+++ b/src/parse/properties/border_outline.c
@@ -2071,7 +2071,7 @@ css_error parse_border_side_style(css_language *c,
 			&match) == lwc_error_ok && match)) {
 		value = BORDER_STYLE_SOLID;
 	} else if ((lwc_string_caseless_isequal(
-			ident->idata, c->strings[DOUBLE],
+			ident->idata, c->strings[LIBCSS_DOUBLE],
 			&match) == lwc_error_ok && match)) {
 		value = BORDER_STYLE_DOUBLE;
 	} else if ((lwc_string_caseless_isequal(
diff --git a/src/parse/properties/positioning.c b/src/parse/properties/positioning.c
index c4393aa..9e5ac73 100644
--- a/src/parse/properties/positioning.c
+++ b/src/parse/properties/positioning.c
@@ -138,7 +138,7 @@ css_error parse_position(css_language *c,
 			&match) == lwc_error_ok && match)) {
 		flags |= FLAG_INHERIT;
 	} else if ((lwc_string_caseless_isequal(
-			ident->idata, c->strings[STATIC],
+			ident->idata, c->strings[LIBCSS_STATIC],
 			&match) == lwc_error_ok && match)) {
 		value = POSITION_STATIC;
 	} else if ((lwc_string_caseless_isequal(
diff --git a/src/parse/properties/ui.c b/src/parse/properties/ui.c
index 2184ac4..725e7b7 100644
--- a/src/parse/properties/ui.c
+++ b/src/parse/properties/ui.c
@@ -177,7 +177,7 @@ css_error parse_cursor(css_language *c,
 					value = CURSOR_W_RESIZE;
 				}
 			} else if ((lwc_string_caseless_isequal(
-					token->idata, c->strings[TEXT],
+					token->idata, c->strings[LIBCSS_TEXT],
 					&match) == lwc_error_ok && match)) {
 				if (first) {
 					value = CURSOR_TEXT;
@@ -341,7 +341,7 @@ css_error parse_cursor(css_language *c,
 					&match) == lwc_error_ok && match)) {
 				opv = CURSOR_W_RESIZE;
 			} else if ((lwc_string_caseless_isequal(
-					token->idata, c->strings[TEXT],
+					token->idata, c->strings[LIBCSS_TEXT],
 					&match) == lwc_error_ok && match)) {
 				opv = CURSOR_TEXT;
 			} else if ((lwc_string_caseless_isequal(
diff --git a/src/parse/propstrings.h b/src/parse/propstrings.h
index ea16b44..45f6f79 100644
--- a/src/parse/propstrings.h
+++ b/src/parse/propstrings.h
@@ -15,7 +15,7 @@ enum {
 	UNIVERSAL,
 
 	/* At-rules */
-	CHARSET, IMPORT, MEDIA, PAGE,
+	CHARSET, LIBCSS_IMPORT, MEDIA, PAGE,
 
 	/* Media types */
 	AURAL, BRAILLE, EMBOSSED, HANDHELD, PRINT, PROJECTION, 
@@ -41,9 +41,9 @@ enum {
 	BORDER_STYLE, BORDER_TOP, BORDER_TOP_COLOR, BORDER_TOP_STYLE, 
 	BORDER_TOP_WIDTH, BORDER_WIDTH, BOTTOM, CAPTION_SIDE, CLEAR, 
 	CLIP, COLOR, CONTENT, COUNTER_INCREMENT, COUNTER_RESET, CUE, CUE_AFTER, 
-	CUE_BEFORE, CURSOR, DIRECTION, DISPLAY, ELEVATION, EMPTY_CELLS, FLOAT, 
-	FONT, FONT_FAMILY, FONT_SIZE, FONT_STYLE, FONT_VARIANT, FONT_WEIGHT, 
-	HEIGHT, LEFT, LETTER_SPACING, LINE_HEIGHT, 
+	CUE_BEFORE, CURSOR, DIRECTION, DISPLAY, ELEVATION, EMPTY_CELLS, 
+	LIBCSS_FLOAT, FONT, FONT_FAMILY, FONT_SIZE, FONT_STYLE, FONT_VARIANT, 
+	FONT_WEIGHT, HEIGHT, LEFT, LETTER_SPACING, LINE_HEIGHT, 
 	LIST_STYLE, LIST_STYLE_IMAGE, LIST_STYLE_POSITION, LIST_STYLE_TYPE, 
 	MARGIN, MARGIN_BOTTOM, MARGIN_LEFT, MARGIN_RIGHT, MARGIN_TOP, 
 	MAX_HEIGHT, MAX_WIDTH, MIN_HEIGHT, MIN_WIDTH, ORPHANS, 
@@ -62,7 +62,7 @@ enum {
 	/* Other keywords */
 	INHERIT, IMPORTANT, NONE, BOTH, FIXED, SCROLL, TRANSPARENT,
 	NO_REPEAT, REPEAT_X, REPEAT_Y, REPEAT, HIDDEN, DOTTED, DASHED,
-	SOLID, DOUBLE, GROOVE, RIDGE, INSET, OUTSET, THIN, MEDIUM, THICK,
+	SOLID, LIBCSS_DOUBLE, GROOVE, RIDGE, INSET, OUTSET, THIN, MEDIUM, THICK,
 	COLLAPSE, SEPARATE, AUTO, LTR, RTL, INLINE, BLOCK, LIST_ITEM, RUN_IN,
 	INLINE_BLOCK, TABLE, INLINE_TABLE, TABLE_ROW_GROUP, TABLE_HEADER_GROUP,
 	TABLE_FOOTER_GROUP, TABLE_ROW, TABLE_COLUMN_GROUP, TABLE_COLUMN,
@@ -72,7 +72,7 @@ enum {
 	LIGHTER, INSIDE, OUTSIDE, DISC, CIRCLE, SQUARE, DECIMAL, 
 	DECIMAL_LEADING_ZERO, LOWER_ROMAN, UPPER_ROMAN, LOWER_GREEK,
 	LOWER_LATIN, UPPER_LATIN, ARMENIAN, GEORGIAN, LOWER_ALPHA, UPPER_ALPHA,
-	INVERT, VISIBLE, ALWAYS, AVOID, X_LOW, LOW, HIGH, X_HIGH, STATIC,
+	INVERT, VISIBLE, ALWAYS, AVOID, X_LOW, LOW, HIGH, X_HIGH, LIBCSS_STATIC,
 	RELATIVE, ABSOLUTE, ONCE, DIGITS, CONTINUOUS, CODE, SPELL_OUT, X_SLOW,
 	SLOW, FAST, X_FAST, FASTER, SLOWER, CENTER, JUSTIFY, CAPITALIZE,
 	UPPERCASE, LOWERCASE, EMBED, BIDI_OVERRIDE, BASELINE, SUB, SUPER,
@@ -82,7 +82,7 @@ enum {
 	RECT, OPEN_QUOTE, CLOSE_QUOTE, NO_OPEN_QUOTE, NO_CLOSE_QUOTE, ATTR, 
 	COUNTER, COUNTERS, CROSSHAIR, DEFAULT, POINTER, MOVE, E_RESIZE, 
 	NE_RESIZE, NW_RESIZE, N_RESIZE, SE_RESIZE, SW_RESIZE, S_RESIZE, 
-	W_RESIZE, TEXT, WAIT, HELP, PROGRESS, SERIF, SANS_SERIF, CURSIVE, 
+	W_RESIZE, LIBCSS_TEXT, WAIT, HELP, PROGRESS, SERIF, SANS_SERIF, CURSIVE,
 	FANTASY, MONOSPACE, MALE, FEMALE, CHILD, MIX, UNDERLINE, OVERLINE, 
 	LINE_THROUGH, BLINK, RGB, RGBA, LIBCSS_LEFT, LIBCSS_CENTER,
 	LIBCSS_RIGHT,