From d6ddccf64a823d6bc28be3e11db45b9a5f136161 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Mon, 25 Jun 2007 11:28:25 +0000 Subject: [PATCH] Add ifdefs around pragma Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2892 --- src/ints/xms.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ints/xms.cpp b/src/ints/xms.cpp index 539f5d54..0531eb31 100644 --- a/src/ints/xms.cpp +++ b/src/ints/xms.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: xms.cpp,v 1.47 2007-06-12 20:22:09 c2woody Exp $ */ +/* $Id: xms.cpp,v 1.48 2007-06-25 11:28:25 qbix79 Exp $ */ #include #include @@ -81,7 +81,9 @@ struct XMS_Block { bool free; }; -#pragma pack (push,1) +#ifdef _MSC_VER +#pragma pack (1) +#endif struct XMS_MemMove{ Bit32u length; Bit16u src_handle; @@ -96,7 +98,10 @@ struct XMS_MemMove{ } dest; } GCC_ATTRIBUTE(packed); +#ifdef _MSC_VER #pragma pack (pop) +#endif + Bitu XMS_EnableA20(bool enable) {