summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-09 23:55:10 +0000
committersuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-09 23:55:10 +0000
commit9975389fad7b8a5cf38c8b84f0e4113131faeb0f (patch)
treed6a7da1239d9caa288be6cd2679bc7d6500b2619
parenta52468eef6b0e364f2160a767fd8d9dd0ad5eabd (diff)
* ext/win32ole/win32ole.c (ole_variant2val): fix compile error
on VC++. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@11686 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/win32ole/win32ole.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 634564c67c..9bc965130e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 10 09:08:01 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c (ole_variant2val): fix compile error
+ on VC++.
+
Sat Feb 10 08:38:30 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_variant2val): fix the bug when
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index d784e866d1..ce28a8472b 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -920,12 +920,12 @@ ole_variant2val(pvar)
VARIANT variant;
VALUE val;
VALUE val2;
+ int dim = SafeArrayGetDim(psa);
if (!psa) {
return obj;
}
- int dim = SafeArrayGetDim(psa);
VariantInit(&variant);
V_VT(&variant) = (V_VT(pvar) & ~VT_ARRAY) | VT_BYREF;