Rename TRANSPARENT to NS_TRANSPARENT to avoid clash on Windows. By MarkieB.

svn path=/trunk/netsurf/; revision=8513

3 files changed, 7 insertions, 7 deletions

diff --git a/css/css.c b/css/css.c
index 0f652c2e6..b035323d4 100644
--- a/css/css.c
+++ b/css/css.c
@@ -314,7 +314,7 @@ const struct css_style css_empty_style = {
  *  and the 'Initial value' otherwise. */
 const struct css_style css_blank_style = {
 	CSS_BACKGROUND_ATTACHMENT_SCROLL,
-	TRANSPARENT,
+	NS_TRANSPARENT,
 	{ CSS_BACKGROUND_IMAGE_NONE, 0 },
 	{ { CSS_BACKGROUND_POSITION_PERCENT, { 0.0 } },
 	  { CSS_BACKGROUND_POSITION_PERCENT, { 0.0 } } },
@@ -1596,7 +1596,7 @@ void css_dump_style(FILE *stream, const struct css_style * const style)
 
 #define DUMP_COLOR(z, s) \
 	if (style->z != CSS_COLOR_NOT_SET) {				\
-		if (style->z == TRANSPARENT)				\
+		if (style->z == NS_TRANSPARENT)				\
 			fprintf(stream, s ": transparent; ");		\
 		else if (style->z == CSS_COLOR_NONE)			\
 			fprintf(stream, s ": none; ");			\
@@ -1751,7 +1751,7 @@ void css_dump_style(FILE *stream, const struct css_style * const style)
 					css_border_style_name[
 						style->border[i].style]);
 
-			if (style->border[i].color == TRANSPARENT)
+			if (style->border[i].color == NS_TRANSPARENT)
 				fprintf(stream, " transparent");
 			else if (style->border[i].color == CSS_COLOR_NONE)
 				fprintf(stream, " none");
@@ -2144,7 +2144,7 @@ void css_dump_style(FILE *stream, const struct css_style * const style)
 			fprintf(stream, " invert");
 			break;
 		case CSS_OUTLINE_COLOR_COLOR:
-			if (style->outline.color.value == TRANSPARENT)
+			if (style->outline.color.value == NS_TRANSPARENT)
 				fprintf(stream, " transparent");
 			else if (style->outline.color.value == CSS_COLOR_NONE)
 				fprintf(stream, " none");
diff --git a/css/css.h b/css/css.h
index b3ff34ea0..11aa6a195 100644
--- a/css/css.h
+++ b/css/css.h
@@ -42,7 +42,7 @@
 
 
 typedef uint32_t colour;  /* 0xbbggrr */
-#define TRANSPARENT 0x1000000
+#define NS_TRANSPARENT 0x1000000
 #define CSS_COLOR_INHERIT 0x2000000
 #define CSS_COLOR_NONE 0x3000000
 #define CSS_COLOR_NOT_SET 0x4000000
diff --git a/css/ruleset.c b/css/ruleset.c
index 43efdcd05..46bc5e2a5 100644
--- a/css/ruleset.c
+++ b/css/ruleset.c
@@ -462,7 +462,7 @@ static const struct css_colour_entry css_colour_table[] = {
 	{ "teal",			0x808000 },
 	{ "thistle",			0xd8bfd8 },
 	{ "tomato",			0x4763ff },
-	{ "transparent",		TRANSPARENT },
+	{ "transparent",		NS_TRANSPARENT },
 	{ "turquoise",			0xd0e040 },
 	{ "violet",			0xee82ee },
 	{ "violetred",			0x9020d0 }, /* not SVG-1.0*/
@@ -902,7 +902,7 @@ bool parse_uri(const struct css_node *v, char **uri)
 void parse_background(struct css_style * const s,
 		const struct css_node * v)
 {
-	colour c = TRANSPARENT, c2;
+	colour c = NS_TRANSPARENT, c2;
 	css_background_image_type bi = CSS_BACKGROUND_IMAGE_NONE, bi2;
 	char *bi_uri = 0;
 	css_background_repeat br = CSS_BACKGROUND_REPEAT_REPEAT, br2;