From c39d76278334a0838f79655ba27bbe68bfec7f8f Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Tue, 30 Dec 2008 17:56:45 +0000 Subject: Merged revisions 67982,67988,67990 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r67982 | benjamin.peterson | 2008-12-28 09:37:31 -0600 (Sun, 28 Dec 2008) | 1 line fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728 ........ r67988 | ronald.oussoren | 2008-12-28 13:40:56 -0600 (Sun, 28 Dec 2008) | 1 line Issue4064: architecture string for universal builds on OSX ........ r67990 | ronald.oussoren | 2008-12-28 13:50:40 -0600 (Sun, 28 Dec 2008) | 3 lines Update the fix for issue4064 to deal correctly with all three variants of universal builds that are presented by the configure script. ........ --- Include/pymacconfig.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'Include/pymacconfig.h') diff --git a/Include/pymacconfig.h b/Include/pymacconfig.h index e864e72eb2..a8679af498 100644 --- a/Include/pymacconfig.h +++ b/Include/pymacconfig.h @@ -15,6 +15,8 @@ # undef SIZEOF_SIZE_T # undef SIZEOF_TIME_T # undef SIZEOF_VOID_P +# undef SIZEOF__BOOL +# undef WORDS_BIGENDIAN # undef VA_LIST_IS_ARRAY # if defined(__LP64__) && defined(__x86_64__) @@ -28,12 +30,19 @@ # undef SIZEOF_LONG # ifdef __LP64__ +# define SIZEOF__BOOL 1 +# define SIZEOF__BOOL 1 # define SIZEOF_LONG 8 # define SIZEOF_PTHREAD_T 8 # define SIZEOF_SIZE_T 8 # define SIZEOF_TIME_T 8 # define SIZEOF_VOID_P 8 # else +# ifdef __ppc__ +# define SIZEOF__BOOL 4 +# else +# define SIZEOF__BOOL 1 +# endif # define SIZEOF_LONG 4 # define SIZEOF_PTHREAD_T 4 # define SIZEOF_SIZE_T 4 @@ -54,6 +63,11 @@ # endif +#ifdef __BIG_ENDIAN__ +#define WORDS_BIGENDIAN 1 +#endif /* __BIG_ENDIAN */ + + #endif /* defined(_APPLE__) */ #endif /* PYMACCONFIG_H */ -- cgit v1.2.3