From: Michael Brown <mcb30@etherboot.org>
Date: Tue, 30 Jan 2007 10:12:19 +0000 (+0000)
Subject: Use "dbg_stream" rather than "stream" as a variable name in
X-Git-Tag: v0.9.3~500
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=395c76e94de278921130df0a48beaf45c5781e3c;p=thirdparty%2Fipxe.git

Use "dbg_stream" rather than "stream" as a variable name in
DBG_AC_IF(), to avoid namespace collisions.
---

diff --git a/src/include/compiler.h b/src/include/compiler.h
index 643ab250e..18ca75c96 100644
--- a/src/include/compiler.h
+++ b/src/include/compiler.h
@@ -198,9 +198,9 @@ extern void dbg_hex_dump_da ( unsigned long dispaddr,
 			union {					\
 				unsigned long ul;		\
 				typeof ( id ) raw;		\
-			} stream;				\
-			stream.raw = id;			\
-			dbg_autocolourise ( stream.ul );	\
+			} dbg_stream;				\
+			dbg_stream.raw = id;			\
+			dbg_autocolourise ( dbg_stream.ul );	\
 		}						\
 	} while ( 0 )