Merge branch 'meta23-master'

1 files changed, 12 insertions, 1 deletions

diff --git a/src/import.cc b/src/import.cc
index bd9d387..a924e24 100644
--- a/src/import.cc
+++ b/src/import.cc
@@ -174,13 +174,24 @@ PolySet *ImportNode::render_polyset(render_mode_e) const
 		{
 			f.read(80-5+4);
 			while (1) {
+#ifdef _MSC_VER
+#pragma pack(push,1)
+#endif
 				struct {
 					float i, j, k;
 					float x1, y1, z1;
 					float x2, y2, z2;
 					float x3, y3, z3;
 					unsigned short acount;
-				} __attribute__ ((packed)) data;
+				}
+#ifdef __GNUC__
+				__attribute__ ((packed))
+#endif
+				data;
+#ifdef _MSC_VER
+#pragma pack(pop)
+#endif
+
 				if (f.read((char*)&data, sizeof(data)) != sizeof(data))
 					break;
 				p->append_poly();