archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Mon, 22 Nov 2010 05:15:39 +0000 shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>

Browse source 
merge revision(s) 29849:
 
 merge revision(s) 28835,28894:
 	* ext/win32ole/win32ole.c: NONAMELESSUNION defined only if gcc
 	  version is older than 3.4.4. [ruby-core:31567] [Bug #3637]
 	* ext/win32ole/extconf.rb: ditto.
 	* ext/win32ole/win32ole.c: fix checking version of GCC.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29867 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-11-22 07:22:26 +00:00
parent 2a9739f1a4
commit 16b5c5e928
4 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Mon Nov 22 14:13:45 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c: fix checking version of GCC.
Mon Nov 22 14:13:45 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c: NONAMELESSUNION defined only if gcc
version is older than 3.4.4. [ruby-core:31567] [Bug #3637]
* ext/win32ole/extconf.rb: ditto.
Fri Nov 19 19:28:00 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* Makefile.in (fake.rb): hook needed to fake mkmf.rb.

2
ext/win32ole/extconf.rb
View file

@ -35,7 +35,5 @@ end
case RUBY_PLATFORM
when /mswin32/
$CFLAGS += ' /W3'
when /cygwin/, /mingw/
$defs << '-DNONAMELESSUNION'
end
create_win32ole_makefile

18
ext/win32ole/win32ole.c
View file

@ -17,6 +17,20 @@
#include "ruby.h"
#include "st.h"
#define GNUC_OLDER_3_4_4 \
((__GNUC__ < 3) || \
((__GNUC__ <= 3) && (__GNUC_MINOR__ < 4)) || \
((__GNUC__ <= 3) && (__GNUC_MINOR__ <= 4) && (__GNUC_PATCHLEVEL__ <= 4)))
#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4)
#ifndef NONAMELESSUNION
#define NONAMELESSUNION 1
#endif
#endif
#include <ctype.h>
#include <windows.h>
#include <ocidl.h>
#include <olectl.h>
@ -36,13 +50,13 @@
#define DOUTI(x) fprintf(stderr, "[%ld]:" #x "=%d\n",__LINE__,x)
#define DOUTD(x) fprintf(stderr, "[%d]:" #x "=%f\n",__LINE__,x)
#if defined NONAMELESSUNION && __GNUC__
#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4)
#define V_UNION1(X, Y) ((X)->u.Y)
#else
#define V_UNION1(X, Y) ((X)->Y)
#endif
#if defined NONAMELESSUNION && __GNUC__
#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4)
#undef V_UNION
#define V_UNION(X,Y) ((X)->n1.n2.n3.Y)

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2010-11-22"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20101122
#define RUBY_PATCHLEVEL 316
#define RUBY_PATCHLEVEL 317
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8