X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2276c2959446be677a52f639d8f92e5a0e216c32..491b5be8305968871bc289453ed088a70c3de044:/src/mac/morefile/IterateD.cpp

diff --git a/src/mac/morefile/IterateD.cpp b/src/mac/morefile/IterateD.cpp
index 6b7e52a78c..4786b80c01 100644
--- a/src/mac/morefile/IterateD.cpp
+++ b/src/mac/morefile/IterateD.cpp
@@ -22,8 +22,8 @@
 
 #define	__COMPILINGMOREFILES
 
-#include "MoreExtr.h"
-#include "IterateD.h"
+#include "moreextr.h"
+#include "iterated.h"
 
 /*
 **	Type definitions
@@ -33,9 +33,14 @@
 ** stack space used when recursively calling IterateDirectoryLevel
 ** and to hold global information that might be needed at any time.
 */
-#if PRAGMA_ALIGN_SUPPORTED
-#pragma options align=mac68k
+#if PRAGMA_STRUCT_ALIGN
+    #pragma options align=mac68k
+#elif PRAGMA_STRUCT_PACKPUSH
+    #pragma pack(push, 2)
+#elif PRAGMA_STRUCT_PACK
+    #pragma pack(2)
 #endif
+
 struct IterateGlobals
 {
 	IterateFilterProcPtr	iterateFilter;	/* pointer to IterateFilterProc */
@@ -47,8 +52,13 @@ struct IterateGlobals
 	unsigned short			currentLevel;	/* The current level IterateLevel is on */
 	void					*yourDataPtr;	/* A pointer to caller data the filter may need to access */
 };
-#if PRAGMA_ALIGN_SUPPORTED
-#pragma options align=reset
+
+#if PRAGMA_STRUCT_ALIGN
+    #pragma options align=reset
+#elif PRAGMA_STRUCT_PACKPUSH
+    #pragma pack(pop)
+#elif PRAGMA_STRUCT_PACK
+    #pragma pack()
 #endif
 
 typedef struct IterateGlobals IterateGlobals;