diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-21 12:13:07 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-21 12:13:07 +0000 |
commit | 1fe71722e2b37be3518643a2abccb29a0cc78174 (patch) | |
tree | 8ac33362735873839f0b4f340143355dfe57903e /win32 | |
parent | db433dc39d07449184a908d417919e3de8b70405 (diff) | |
download | ruby-1fe71722e2b37be3518643a2abccb29a0cc78174.tar.gz |
Makefile.sub: no PACKED_STRUCT on old VC
* win32/Makefile.sub (PACKED_STRUCT): __pragma extension is
available since VC9.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r-- | win32/Makefile.sub | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index d1f424d8ea..259e56b81f 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -575,8 +575,10 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define FUNC_FASTCALL(x) __fastcall x !if $(MSC_VER) >= 1500 #define RUBY_FUNCTION_NAME_STRING __FUNCTION__ -!endif #define PACKED_STRUCT(x) __pragma(pack(push, 1)) x __pragma(pack(pop)) +!else +#define PACKED_STRUCT(x) x +!endif !if "$(ARCH)" == "x86" || "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" #define PACKED_STRUCT_UNALIGNED(x) PACKED_STRUCT(x) !else |