From 83fd4b6217f1a5f363ce0d8fe1bf4e066528e729 Mon Sep 17 00:00:00 2001
From: Johannes Stezenbach <devnull@localhost>
Date: Sat, 7 Feb 2004 16:39:12 +0000
Subject: gcc-3.5 compatibilty patch from 2.6.3-rc1

---
 linux/drivers/media/dvb/frontends/ves1820.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'linux/drivers/media/dvb/frontends')

diff --git a/linux/drivers/media/dvb/frontends/ves1820.c b/linux/drivers/media/dvb/frontends/ves1820.c
index 1e05663d5..8640243c6 100644
--- a/linux/drivers/media/dvb/frontends/ves1820.c
+++ b/linux/drivers/media/dvb/frontends/ves1820.c
@@ -48,23 +48,31 @@ static int verbose;
  */
 
 #define SET_PWM(data,pwm) do {		\
-	(long) data &= ~0xff;		\
-	(long) data |= pwm;		\
+	long d = (long)data;		\
+	d &= ~0xff;			\
+	d |= pwm;			\
+	data = (void *)d;		\
 } while (0)
 
 #define SET_REG0(data,reg0) do {	\
-	(long) data &= ~(0xff << 8);	\
-	(long) data |= reg0 << 8;	\
+	long d = (long)data;		\
+	d &= ~(0xff << 8);		\
+	d |= reg0 << 8;			\
+	data = (void *)d;		\
 } while (0)
 
 #define SET_TUNER(data,type) do {	\
-	(long) data &= ~(0xff << 16);	\
-	(long) data |= type << 16;	\
+	long d = (long)data;		\
+	d &= ~(0xff << 16);		\
+	d |= type << 16;		\
+	data = (void *)d;		\
 } while (0)
 
 #define SET_DEMOD_ADDR(data,type) do {	\
-	(long) data &= ~(0xff << 24);	\
-	(long) data |= type << 24;	\
+	long d = (long)data;		\
+	d &= ~(0xff << 24);		\
+	d |= type << 24;		\
+	data = (void *)d;		\
 } while (0)
 
 #define GET_PWM(data) ((u8) ((long) data & 0xff))
-- 
cgit v1.2.3