Index: OAIdl.h =================================================================== RCS file: /cvsroot/GxInclude/Vc71/PlatformSDK/OAIdl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -c -3 -p -r1.1 -r1.2 *** OAIdl.h 10 Jun 2003 16:12:31 -0000 1.1 --- OAIdl.h 10 Jun 2003 17:36:05 -0000 1.2 *************** struct tagVARIANT *** 439,445 **** FLOAT fltVal; DOUBLE dblVal; VARIANT_BOOL boolVal; ! _VARIANT_BOOL bool; SCODE scode; CY cyVal; DATE date; --- 439,445 ---- FLOAT fltVal; DOUBLE dblVal; VARIANT_BOOL boolVal; ! // _VARIANT_BOOL bool; SCODE scode; CY cyVal; DATE date; *************** struct tagVARIANT *** 454,460 **** FLOAT *pfltVal; DOUBLE *pdblVal; VARIANT_BOOL *pboolVal; ! _VARIANT_BOOL *pbool; SCODE *pscode; CY *pcyVal; DATE *pdate; --- 454,460 ---- FLOAT *pfltVal; DOUBLE *pdblVal; VARIANT_BOOL *pboolVal; ! // _VARIANT_BOOL *pbool; SCODE *pscode; CY *pcyVal; DATE *pdate; Index: PropIdl.h =================================================================== RCS file: /cvsroot/GxInclude/Vc71/PlatformSDK/PropIdl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -c -3 -p -r1.1 -r1.2 *** PropIdl.h 10 Jun 2003 16:12:31 -0000 1.1 --- PropIdl.h 10 Jun 2003 17:36:05 -0000 1.2 *************** struct tag_inner_PROPVARIANT *** 307,313 **** /* [case()] */ FLOAT fltVal; /* [case()] */ DOUBLE dblVal; /* [case()] */ VARIANT_BOOL boolVal; ! /* [case()] */ _VARIANT_BOOL bool; /* [case()] */ SCODE scode; /* [case()] */ CY cyVal; /* [case()] */ DATE date; --- 307,313 ---- /* [case()] */ FLOAT fltVal; /* [case()] */ DOUBLE dblVal; /* [case()] */ VARIANT_BOOL boolVal; ! // /* [case()] */ _VARIANT_BOOL bool; /* [case()] */ SCODE scode; /* [case()] */ CY cyVal; /* [case()] */ DATE date; Index: WinNT.h =================================================================== RCS file: /cvsroot/GxInclude/Vc71/PlatformSDK/WinNT.h,v retrieving revision 1.1 retrieving revision 1.2 diff -c -3 -p -r1.1 -r1.2 *** WinNT.h 10 Jun 2003 16:12:32 -0000 1.1 --- WinNT.h 10 Jun 2003 17:36:05 -0000 1.2 *************** Int64ShllMod32 ( *** 649,661 **** DWORD ShiftCount ) { - __asm { - mov ecx, ShiftCount - mov eax, dword ptr [Value] - mov edx, dword ptr [Value+4] - shld edx, eax, cl - shl eax, cl - } } __inline LONGLONG --- 649,654 ---- *************** Int64ShraMod32 ( *** 665,677 **** DWORD ShiftCount ) { - __asm { - mov ecx, ShiftCount - mov eax, dword ptr [Value] - mov edx, dword ptr [Value+4] - shrd eax, edx, cl - sar edx, cl - } } __inline ULONGLONG --- 658,663 ---- *************** Int64ShrlMod32 ( *** 681,693 **** DWORD ShiftCount ) { - __asm { - mov ecx, ShiftCount - mov eax, dword ptr [Value] - mov edx, dword ptr [Value+4] - shrd eax, edx, cl - shr edx, cl - } } #if _MSC_VER >= 1200 --- 667,672 ---- *************** _inline PVOID GetCurrentFiber( void ) { *** 2122,2133 **** #pragma warning(push) #endif #pragma warning (disable:4035) // disable 4035 (function must return something) ! _inline PVOID GetFiberData( void ) { __asm { ! mov eax, fs:[0x10] ! mov eax,[eax] ! } ! } ! _inline PVOID GetCurrentFiber( void ) { __asm mov eax, fs:[0x10] } #if _MSC_VER >= 1200 #pragma warning(pop) --- 2101,2108 ---- #pragma warning(push) #endif #pragma warning (disable:4035) // disable 4035 (function must return something) ! _inline PVOID GetFiberData( void ) {} ! _inline PVOID GetCurrentFiber( void ) {} #if _MSC_VER >= 1200 #pragma warning(pop)