diff --git a/include/begin_code.h b/include/begin_code.h index 133c6c158..b5d4e66b7 100644 --- a/include/begin_code.h +++ b/include/begin_code.h @@ -59,14 +59,19 @@ packing set to an alternate value, say for loading structures from disk. The packing is reset to the previous value in close_code.h */ -#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__WATCOMC__) || defined(__BORLANDC__) +#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__APPLE__) #ifdef _MSC_VER #pragma warning(disable: 4103) #endif #ifdef __BORLANDC__ #pragma nopackwarning #endif +#if (defined(__MWERKS__) && defined(macintosh)) +#pragma options align=mac68k4byte +#pragma enumsalwaysint on +#else #pragma pack(push,4) +#endif #endif /* Compiler needs structure packing set */ /* Set up compiler-specific options for inlining functions */ diff --git a/include/close_code.h b/include/close_code.h index 0a3044f00..d3b5c07e8 100644 --- a/include/close_code.h +++ b/include/close_code.h @@ -31,6 +31,11 @@ #ifdef __BORLANDC__ #pragma nopackwarning #endif +#if (defined(__MWERKS__) && defined(macintosh)) +#pragma options align=reset +#pragma enumsalwaysint reset +#else #pragma pack(pop) +#endif #endif /* Compiler needs structure packing set */