summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2001-01-19 23:45:57 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2001-01-19 23:45:57 (GMT)
commit726d873887c9c7bc9a8296780780b3b6975d1240 (patch)
treecee6c3d2dc472fa6bc044a17a6d48de268a63731
parentc7050d9bb965b094efc87873911d22b0b5b672d8 (diff)
downloadcpython-726d873887c9c7bc9a8296780780b3b6975d1240.zip
cpython-726d873887c9c7bc9a8296780780b3b6975d1240.tar.gz
cpython-726d873887c9c7bc9a8296780780b3b6975d1240.tar.bz2
Undefine and redefine PRAGMA_ALIGN_SUPPORTED under Carbon. Apple's "solution" of a funny define makes portable code impossible:-(
-rw-r--r--Mac/Modules/icgluemodule.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/Mac/Modules/icgluemodule.c b/Mac/Modules/icgluemodule.c
index 4c3c495..2189996 100644
--- a/Mac/Modules/icgluemodule.c
+++ b/Mac/Modules/icgluemodule.c
@@ -34,6 +34,14 @@ PERFORMANCE OF THIS SOFTWARE.
extern int ResObj_Convert(PyObject *, Handle *); /* From Resmodule.c */
+#if TARGET_API_MAC_CARBON
+/* The Carbon headers define PRAGMA_ALIGN_SUPPORT to something illegal,
+** because you shouldn't use it for Carbon. All good and well, but portable
+** code still needs it. So, we undefine it here.
+*/
+#undef PRAGMA_ALIGN_SUPPORTED
+#define PRAGMA_ALIGN_SUPPORTED 0
+#endif /* TARGET_API_MAC_CARBON */
#include "ICAPI.h"