1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix _MSC_VER warnings

Browse Source
This commit is contained in:
Daisuke Fujimura (fd0) 2021-05-13 07:22:08 +09:00 committed by Nobuyoshi Nakada
parent 750f807575
commit e451f0f678
Notes: git 2021-06-03 00:07:55 +09:00 
Merged: https://github.com/ruby/ruby/pull/4497
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ext/win32ole/win32ole.c
View File

@ -995,7 +995,7 @@ ole_val2variant_ex(VALUE val, VARIANT *var, VARTYPE vt)
} }
return; return;
} }
#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) #if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
switch(vt & ~VT_BYREF) { switch(vt & ~VT_BYREF) {
case VT_I8: case VT_I8:
V_VT(var) = VT_I8; V_VT(var) = VT_I8;
@ -1009,7 +1009,7 @@ ole_val2variant_ex(VALUE val, VARIANT *var, VARTYPE vt)
ole_val2variant2(val, var); ole_val2variant2(val, var);
break; break;
} }
#else /* (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) */ #else /* (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__) */
ole_val2variant2(val, var); ole_val2variant2(val, var);
#endif #endif
} }
@ -1063,7 +1063,7 @@ get_ptr_of_variant(VARIANT *pvar)
case VT_R8: case VT_R8:
return &V_R8(pvar); return &V_R8(pvar);
break; break;
#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) #if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
case VT_I8: case VT_I8:
return &V_I8(pvar); return &V_I8(pvar);
break; break;
@ -1550,10 +1550,10 @@ ole_variant2val(VARIANT *pvar)
obj = RB_INT2NUM((long)V_UINT(pvar)); obj = RB_INT2NUM((long)V_UINT(pvar));
break; break;
#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) #if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
case VT_I8: case VT_I8:
if(V_ISBYREF(pvar)) if(V_ISBYREF(pvar))
#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) #if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
#ifdef V_I8REF #ifdef V_I8REF
obj = I8_2_NUM(*V_I8REF(pvar)); obj = I8_2_NUM(*V_I8REF(pvar));
#endif #endif
@ -1565,7 +1565,7 @@ ole_variant2val(VARIANT *pvar)
break; break;
case VT_UI8: case VT_UI8:
if(V_ISBYREF(pvar)) if(V_ISBYREF(pvar))
#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) #if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
#ifdef V_UI8REF #ifdef V_UI8REF
obj = UI8_2_NUM(*V_UI8REF(pvar)); obj = UI8_2_NUM(*V_UI8REF(pvar));
#endif #endif
@ -1575,7 +1575,7 @@ ole_variant2val(VARIANT *pvar)
else else
obj = UI8_2_NUM(V_UI8(pvar)); obj = UI8_2_NUM(V_UI8(pvar));
break; break;
#endif /* (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) */ #endif /* (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__) */
case VT_R4: case VT_R4:
if(V_ISBYREF(pvar)) if(V_ISBYREF(pvar))
@ -3753,7 +3753,7 @@ ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
case VT_UI4: case VT_UI4:
typestr = rb_str_new2("UI4"); typestr = rb_str_new2("UI4");
break; break;
#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) #if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
case VT_I8: case VT_I8:
typestr = rb_str_new2("I8"); typestr = rb_str_new2("I8");
break; break;

4
ext/win32ole/win32ole_variant.c
View File

@ -94,7 +94,7 @@ ole_val2olevariantdata(VALUE val, VARTYPE vt, struct olevariantdata *pvar)
} }
} }
} }
#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) #if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
} else if ( (vt & ~VT_BYREF) == VT_I8 || (vt & ~VT_BYREF) == VT_UI8) { } else if ( (vt & ~VT_BYREF) == VT_I8 || (vt & ~VT_BYREF) == VT_UI8) {
ole_val2variant_ex(val, &(pvar->realvar), (vt & ~VT_BYREF)); ole_val2variant_ex(val, &(pvar->realvar), (vt & ~VT_BYREF));
ole_val2variant_ex(val, &(pvar->var), (vt & ~VT_BYREF)); ole_val2variant_ex(val, &(pvar->var), (vt & ~VT_BYREF));
@ -202,7 +202,7 @@ ole_set_byref(VARIANT *realvar, VARIANT *var, VARTYPE vt)
V_R8REF(var) = &V_R8(realvar); V_R8REF(var) = &V_R8(realvar);
break; break;
#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) #if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
#ifdef V_I8REF #ifdef V_I8REF
case VT_I8: case VT_I8:
V_I8REF(var) = &V_I8(realvar); V_I8REF(var) = &V_I8(realvar);

2
ext/win32ole/win32ole_variant_m.c
View File

@ -116,7 +116,7 @@ void Init_win32ole_variant_m(void)
*/ */
rb_define_const(mWIN32OLE_VARIANT, "VT_UI4", RB_INT2FIX(VT_UI4)); rb_define_const(mWIN32OLE_VARIANT, "VT_UI4", RB_INT2FIX(VT_UI4));
#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) #if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__)
/* /*
* represents VT_I8 type constant. * represents VT_I8 type constant.
*/ */