On Sun, 31 Dec 2000, James Juran wrote:
> I'm using Red Hat 7.0 + gcc update (yes, I know Red Hat shouldn't have
> shipped a snapshot release of gcc).
You're wrong about this, but let's argue it somewhere else. ;)
The patch I've attached fixes the problem and also a couple of ISO
C99-noncompliance warnings.
LLaP
bero
--- wine-build/include/wine/obj_base.h.redhat Sun Dec 31 17:00:47 2000
+++ wine-build/include/wine/obj_base.h Sun Dec 31 17:01:05 2000
@@ -389,54 +389,54 @@
#endif
#define ICOM_METHOD(ret,xfn) \
- ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me);
+ ret CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me);
#define ICOM_METHOD1(ret,xfn,ta,na) \
- ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a);
+ ret CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a);
#define ICOM_METHOD2(ret,xfn,ta,na,tb,nb) \
- ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b);
+ ret CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b);
#define ICOM_METHOD3(ret,xfn,ta,na,tb,nb,tc,nc) \
- ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c);
+ ret CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c);
#define ICOM_METHOD4(ret,xfn,ta,na,tb,nb,tc,nc,td,nd) \
- ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
+ ret CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
#define ICOM_METHOD5(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne) \
- ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
+ ret CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
#define ICOM_METHOD6(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf) \
- ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
+ ret CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
#define ICOM_METHOD7(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng) \
- ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf
f,tg g);
+ ret CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg
+g);
#define ICOM_METHOD8(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh) \
- ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf
f,tg g,th h);
+ ret CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg
+g,th h);
#define ICOM_METHOD9(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni) \
- ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf
f,tg g,th h,ti i);
+ ret CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg
+g,th h,ti i);
#define
ICOM_METHOD10(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj) \
- ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf
f,tg g,th h,ti i,tj j);
+ ret CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg
+g,th h,ti i,tj j);
#define
ICOM_METHOD11(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,tk,nk)
\
- ret CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf
f,tg g,th h,ti i,tj j,tk k);
+ ret CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg
+g,th h,ti i,tj j,tk k);
#define ICOM_VMETHOD(xfn) \
- void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me);
+ void CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me);
#define ICOM_VMETHOD1(xfn,ta,na) \
- void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a);
+ void CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a);
#define ICOM_VMETHOD2(xfn,ta,na,tb,nb) \
- void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b);
+ void CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b);
#define ICOM_VMETHOD3(xfn,ta,na,tb,nb,tc,nc) \
- void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c);
+ void CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c);
#define ICOM_VMETHOD4(xfn,ta,na,tb,nb,tc,nc,td,nd) \
- void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
+ void CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
#define ICOM_VMETHOD5(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne) \
- void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
+ void CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
#define ICOM_VMETHOD6(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf) \
- void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf
f);
+ void CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
#define ICOM_VMETHOD7(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng) \
- void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf
f,tg g);
+ void CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg
+g);
#define ICOM_VMETHOD8(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,nh) \
- void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf
f,tg g,th h);
+ void CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg
+g,th h);
#define ICOM_VMETHOD9(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ni) \
- void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf
f,tg g,th h,ti i);
+ void CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg
+g,th h,ti i);
#define ICOM_VMETHOD10(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,nj)
\
- void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf
f,tg g,th h,ti i,tj j);
+ void CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg
+g,th h,ti i,tj j);
#define
ICOM_VMETHOD11(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj,nk) \
- void CALLBACK (*ICOM_FN(##xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf
f,tg g,th h,ti i,tj j,tk k);
+ void CALLBACK (*ICOM_FN(xfn))(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg
+g,th h,ti i,tj j,tk k);
#define ICOM_VTABLE(iface) iface##Vtbl
@@ -476,18 +476,18 @@
#endif /*ICOM_CINTERFACE */
-#define ICOM_CALL(xfn, p) ICOM_VTBL(p)->ICOM_FN(##xfn)(p)
-#define ICOM_CALL1(xfn, p,a) ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a)
-#define ICOM_CALL2(xfn, p,a,b) ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b)
-#define ICOM_CALL3(xfn, p,a,b,c)
ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c)
-#define ICOM_CALL4(xfn, p,a,b,c,d)
ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d)
-#define ICOM_CALL5(xfn, p,a,b,c,d,e)
ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d,e)
-#define ICOM_CALL6(xfn, p,a,b,c,d,e,f)
ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d,e,f)
-#define ICOM_CALL7(xfn, p,a,b,c,d,e,f,g)
ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d,e,f,g)
-#define ICOM_CALL8(xfn, p,a,b,c,d,e,f,g,h)
ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d,e,f,g,h)
-#define ICOM_CALL9(xfn, p,a,b,c,d,e,f,g,h,i)
ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d,e,f,g,h,i)
-#define ICOM_CALL10(xfn, p,a,b,c,d,e,f,g,h,i,j)
ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d,e,f,g,h,i,j)
-#define ICOM_CALL11(xfn, p,a,b,c,d,e,f,g,h,i,j,k)
ICOM_VTBL(p)->ICOM_FN(##xfn)(p,a,b,c,d,e,f,g,h,i,j,k)
+#define ICOM_CALL(xfn, p) ICOM_VTBL(p)->ICOM_FN(xfn)(p)
+#define ICOM_CALL1(xfn, p,a) ICOM_VTBL(p)->ICOM_FN(xfn)(p,a)
+#define ICOM_CALL2(xfn, p,a,b) ICOM_VTBL(p)->ICOM_FN(xfn)(p,a,b)
+#define ICOM_CALL3(xfn, p,a,b,c) ICOM_VTBL(p)->ICOM_FN(xfn)(p,a,b,c)
+#define ICOM_CALL4(xfn, p,a,b,c,d)
+ICOM_VTBL(p)->ICOM_FN(xfn)(p,a,b,c,d)
+#define ICOM_CALL5(xfn, p,a,b,c,d,e)
+ICOM_VTBL(p)->ICOM_FN(xfn)(p,a,b,c,d,e)
+#define ICOM_CALL6(xfn, p,a,b,c,d,e,f)
+ICOM_VTBL(p)->ICOM_FN(xfn)(p,a,b,c,d,e,f)
+#define ICOM_CALL7(xfn, p,a,b,c,d,e,f,g)
+ICOM_VTBL(p)->ICOM_FN(xfn)(p,a,b,c,d,e,f,g)
+#define ICOM_CALL8(xfn, p,a,b,c,d,e,f,g,h)
+ICOM_VTBL(p)->ICOM_FN(xfn)(p,a,b,c,d,e,f,g,h)
+#define ICOM_CALL9(xfn, p,a,b,c,d,e,f,g,h,i)
+ICOM_VTBL(p)->ICOM_FN(xfn)(p,a,b,c,d,e,f,g,h,i)
+#define ICOM_CALL10(xfn, p,a,b,c,d,e,f,g,h,i,j)
+ICOM_VTBL(p)->ICOM_FN(xfn)(p,a,b,c,d,e,f,g,h,i,j)
+#define ICOM_CALL11(xfn, p,a,b,c,d,e,f,g,h,i,j,k)
+ICOM_VTBL(p)->ICOM_FN(xfn)(p,a,b,c,d,e,f,g,h,i,j,k)
/*****************************************************************************
--- wine-build/include/windef.h.redhat Sun Dec 31 17:05:25 2000
+++ wine-build/include/windef.h Sun Dec 31 17:05:32 2000
@@ -27,7 +27,6 @@
#ifdef __WINE__
# define WINELIB_NAME_AW(func) \
- func##_must_be_suffixed_with_W_or_A_in_this_context \
func##_must_be_suffixed_with_W_or_A_in_this_context
#else /* __WINE__ */
# ifdef UNICODE
