summaryrefslogtreecommitdiff
path: root/win32/Makefile.sub
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-21 12:13:07 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-21 12:13:07 +0000
commit1fe71722e2b37be3518643a2abccb29a0cc78174 (patch)
tree8ac33362735873839f0b4f340143355dfe57903e /win32/Makefile.sub
parentdb433dc39d07449184a908d417919e3de8b70405 (diff)
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/Makefile.sub')
-rw-r--r--win32/Makefile.sub4
1 files changed, 3 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index d1f424d..259e56b 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