aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-25 06:51:33 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-25 06:51:33 +0000
commita5df717c8ee7554b0b18d2ad50f49b6b2aadcdd4 (patch)
tree2e7e7113c8c89cd5e196204ec404e614563b8bb3
parentfec37d5036f5e979914926a887e0571fc6db690e (diff)
downloadruby-a5df717c8ee7554b0b18d2ad50f49b6b2aadcdd4.tar.gz
* ext/win32ole/win32ole.c: supress warnings. (win32)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9030 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/win32ole/win32ole.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2be836928e..d736684cae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Aug 25 15:48:58 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * ext/win32ole/win32ole.c: supress warnings. (win32)
+
Wed Aug 24 11:01:26 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* test/logger/test_logger.rb (test_shifting_size): should close log
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index 25984130ab..9f756c44c4 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -1007,7 +1007,7 @@ ole_val2olevariantdata(val, vtype, pvar)
} else {
VariantInit(&var);
hr = VariantChangeTypeEx(&(var), &(pvar->realvar),
- LOCALE_SYSTEM_DEFAULT, 0, vtype & ~VT_BYREF);
+ LOCALE_SYSTEM_DEFAULT, 0, (VARTYPE)(vtype & ~VT_BYREF));
if (SUCCEEDED(hr)) {
VariantClear(&(pvar->realvar));
hr = VariantCopy(&(pvar->realvar), &var);
@@ -6861,7 +6861,6 @@ folevariant_initialize(self, args)
VALUE val;
VALUE vvt;
VARTYPE vt;
- HRESULT hr;
struct olevariantdata *pvar;
len = RARRAY(args)->len;