oleaut32: Make the code in copy_to_variant and copy_from_variant more portable.

The typeof keyword isn't available on all compilers so avoid it if at
all possible.
This commit is contained in:
Rob Shearman 2008-10-02 11:38:05 +01:00 committed by Alexandre Julliard
parent 86a4e99c04
commit 5910626aa2
1 changed files with 2 additions and 2 deletions

View File

@ -59,7 +59,7 @@ static HRESULT copy_to_variant(void *src, VARIANT *pvar, enum VARENUM vt)
#define CASE_COPY(x) \
case VT_ ## x: \
V_ ## x(pvar) = *(typeof(V_ ## x(pvar))*)src; \
memcpy(&V_ ## x(pvar), src, sizeof(V_ ## x(pvar))); \
break
switch(vt) {
@ -106,7 +106,7 @@ static HRESULT copy_from_variant(VARIANT *src, void *dest, enum VARENUM vt)
#define CASE_COPY(x) \
case VT_ ## x: \
*(typeof(V_ ## x(&var))*)dest = V_ ## x(&var); \
memcpy(dest, &V_ ## x(&var), sizeof(V_ ## x(&var))); \
break
switch(vt) {