From 5bc9512a0b41f44ad3cfdf107695e35fd3a15269 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 20 Mar 2006 02:14:24 +0000 Subject: [PATCH] * ext/win32ole/win32ole.c (folevariant_value): could not compile with C90 compiler. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++-- ext/win32ole/win32ole.c | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0712c382a3..d7bedbcbe2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,15 @@ +Mon Mar 20 11:12:38 2006 NAKAMURA Usaku + + * ext/win32ole/win32ole.c (folevariant_value): could not compile + with C90 compiler. + Sun Mar 19 09:46:30 2006 Masaki Suketa - * ext/win32ole/win32ole.c(ole_val2olevariantdata): change behavior + * ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby String object. - * ext/win32ole/win32ole.c(folevariant_value): ditto. + * ext/win32ole/win32ole.c (folevariant_value): ditto. * ext/win32ole/tests/testOLEVARIANT.rb: ditto. diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index e3912bcdad..c42e9f9a29 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -7131,12 +7131,13 @@ folevariant_value(self) if ((vt & ~VT_BYREF) == (VT_UI1|VT_ARRAY)) { SAFEARRAY *psa; + int dim; if (vt & VT_BYREF) { psa = *V_ARRAYREF(&(pvar->var)); } else { psa = V_ARRAY(&(pvar->var)); } - int dim = SafeArrayGetDim(psa); + dim = SafeArrayGetDim(psa); if (dim == 1) { VALUE args = rb_ary_new3(1, rb_str_new2("C*")); val = rb_apply(val, rb_intern("pack"), args);