From 1fe71722e2b37be3518643a2abccb29a0cc78174 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 21 Jul 2014 12:13:07 +0000 Subject: 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 --- win32/Makefile.sub | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3