diff options
| author | Daisuke Fujimura (fd0) <booleanlabel@gmail.com> | 2021-05-13 07:22:08 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-06-03 00:07:25 +0900 |
| commit | e451f0f678b88f9634712856c4a5e45b7d3ca7dc (patch) | |
| tree | eb5f8dc0c9c415a8a774b7344d13ce85e01a3daa /ext/win32ole | |
| parent | 750f80757523bb916beff51cf30e585a378acd84 (diff) | |
| download | ruby-e451f0f678b88f9634712856c4a5e45b7d3ca7dc.tar.gz | |
Fix `_MSC_VER` warnings
Diffstat (limited to 'ext/win32ole')
| -rw-r--r-- | ext/win32ole/win32ole.c | 16 | ||||
| -rw-r--r-- | ext/win32ole/win32ole_variant.c | 4 | ||||
| -rw-r--r-- | ext/win32ole/win32ole_variant_m.c | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 59bae0e774..5ad6a80eb9 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -995,7 +995,7 @@ ole_val2variant_ex(VALUE val, VARIANT *var, VARTYPE vt) } return; } -#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) +#if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__) switch(vt & ~VT_BYREF) { case VT_I8: V_VT(var) = VT_I8; @@ -1009,7 +1009,7 @@ ole_val2variant_ex(VALUE val, VARIANT *var, VARTYPE vt) ole_val2variant2(val, var); break; } -#else /* (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) */ +#else /* (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__) */ ole_val2variant2(val, var); #endif } @@ -1063,7 +1063,7 @@ get_ptr_of_variant(VARIANT *pvar) case VT_R8: return &V_R8(pvar); break; -#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) +#if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__) case VT_I8: return &V_I8(pvar); break; @@ -1550,10 +1550,10 @@ ole_variant2val(VARIANT *pvar) obj = RB_INT2NUM((long)V_UINT(pvar)); break; -#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) +#if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__) case VT_I8: 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 obj = I8_2_NUM(*V_I8REF(pvar)); #endif @@ -1565,7 +1565,7 @@ ole_variant2val(VARIANT *pvar) break; case VT_UI8: 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 obj = UI8_2_NUM(*V_UI8REF(pvar)); #endif @@ -1575,7 +1575,7 @@ ole_variant2val(VARIANT *pvar) else obj = UI8_2_NUM(V_UI8(pvar)); break; -#endif /* (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) */ +#endif /* (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__) */ case VT_R4: if(V_ISBYREF(pvar)) @@ -3753,7 +3753,7 @@ ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails) case VT_UI4: typestr = rb_str_new2("UI4"); break; -#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) +#if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__) case VT_I8: typestr = rb_str_new2("I8"); break; diff --git a/ext/win32ole/win32ole_variant.c b/ext/win32ole/win32ole_variant.c index 5ab29669f6..0953fc324c 100644 --- a/ext/win32ole/win32ole_variant.c +++ b/ext/win32ole/win32ole_variant.c @@ -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) { ole_val2variant_ex(val, &(pvar->realvar), (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); break; -#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) +#if (defined(_MSC_VER) && (_MSC_VER >= 1300)) || defined(__CYGWIN__) || defined(__MINGW32__) #ifdef V_I8REF case VT_I8: V_I8REF(var) = &V_I8(realvar); diff --git a/ext/win32ole/win32ole_variant_m.c b/ext/win32ole/win32ole_variant_m.c index 145c08a16e..c285a00177 100644 --- a/ext/win32ole/win32ole_variant_m.c +++ b/ext/win32ole/win32ole_variant_m.c @@ -116,7 +116,7 @@ void Init_win32ole_variant_m(void) */ 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. */ |