summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-18 10:56:31 +0000
committersuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-18 10:56:31 +0000
commit7ebb63f0389c06e05e047b54fb3171b97f210a34 (patch)
tree3cb8fc64b710596c8973ad7f09f5d4e289345710
parent84eba0de32c3a70a73eef49a435fc860fb359baa (diff)
* ext/win32ole/win32ole.c (folevariant_initialize): remove unnecessary
code. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/win32ole/win32ole.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 105285a644..668248501c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 18 19:54:03 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c (folevariant_initialize): remove unnecessary
+ code.
+
Fri Jul 18 19:11:03 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* lib/matrix/eigenvalue_decomposition: Style fix
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index 1aae4f13c5..59e2fc44f0 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -143,7 +143,7 @@ const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00,
#define WC2VSTR(x) ole_wc2vstr((x), TRUE)
-#define WIN32OLE_VERSION "1.5.9"
+#define WIN32OLE_VERSION "1.6.0"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@@ -8894,7 +8894,6 @@ folevariant_initialize(VALUE self, VALUE args)
vt = NUM2INT(vvt);
ole_val2olevariantdata(val, vt, pvar);
}
- vt = V_VT(&pvar->var);
return self;
}