1diff -aur php-5.3.6/acconfig.h php/acconfig.h
2--- php-5.3.6/acconfig.h	2011-03-17 00:55:56.000000000 -0700
3+++ php/acconfig.h	2011-03-18 14:07:34.000000000 -0700
4@@ -20,6 +20,8 @@
5 
6 /* $Id: acconfig.h 306939 2011-01-01 02:19:59Z felipe $ */
7 
8+#ifndef ZEND_API
9+
10 #if defined(__GNUC__) && __GNUC__ >= 4
11 # define ZEND_API __attribute__ ((visibility("default")))
12 # define ZEND_DLEXPORT __attribute__ ((visibility("default")))
13@@ -120,6 +122,29 @@
14 #endif
15 
16 /*
17+ * Darwin's GCC can generate multiple architectures in a single pass so the size and
18+ * byte order will only be accurate for the one architecture that happened to invoke
19+ * configure.
20+ */
21+#ifdef __DARWIN_BYTE_ORDER
22+#/* This symbol must be allowed to be cleared. */ undef WORDS_BIGENDIAN
23+# if (__DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN)
24+#  define WORDS_BIGENDIAN 1
25+# endif
26+#/* This symbol must be allowed to be cleared. */ undef SIZEOF_LONG
27+#/* This symbol must be allowed to be cleared. */ undef SIZEOF_SIZE_T
28+# ifdef __LP64__
29+#/* This symbol should not be modified by configure. */  define SIZEOF_LONG 8
30+#/* This symbol should not be modified by configure. */  define SIZEOF_SIZE_T 8
31+# else
32+#/* This symbol should not be modified by configure. */  define SIZEOF_LONG 4
33+#/* This symbol should not be modified by configure. */  define SIZEOF_SIZE_T 4
34+# endif
35+#endif
36+
37+#endif	/* ZEND_API */
38+
39+/*
40  * Local variables:
41  * tab-width: 4
42  * c-basic-offset: 4
43diff -aur php-5.3.7RC3/main/php_config.h.in php/main/php_config.h.in
44--- php-5.3.7RC3/main/php_config.h.in	2011-07-14 01:39:29.000000000 -0700
45+++ php/main/php_config.h.in	2011-07-14 16:57:57.000000000 -0700
46@@ -21,6 +21,8 @@
47 
48 /* $Id: acconfig.h 306939 2011-01-01 02:19:59Z felipe $ */
49 
50+#ifndef ZEND_API
51+
52 #if defined(__GNUC__) && __GNUC__ >= 4
53 # define ZEND_API __attribute__ ((visibility("default")))
54 # define ZEND_DLEXPORT __attribute__ ((visibility("default")))
55@@ -3008,6 +3010,29 @@
56 #endif
57 
58 /*
59+ * Darwin's GCC can generate multiple architectures in a single pass so the size and
60+ * byte order will only be accurate for the one architecture that happened to invoke
61+ * configure.
62+ */
63+#ifdef __DARWIN_BYTE_ORDER
64+#/* This symbol must be allowed to be cleared. */ undef WORDS_BIGENDIAN
65+# if (__DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN)
66+#  define WORDS_BIGENDIAN 1
67+# endif
68+#/* This symbol must be allowed to be cleared. */ undef SIZEOF_LONG
69+#/* This symbol must be allowed to be cleared. */ undef SIZEOF_SIZE_T
70+# ifdef __LP64__
71+#/* This symbol should not be modified by configure. */  define SIZEOF_LONG 8
72+#/* This symbol should not be modified by configure. */  define SIZEOF_SIZE_T 8
73+# else
74+#/* This symbol should not be modified by configure. */  define SIZEOF_LONG 4
75+#/* This symbol should not be modified by configure. */  define SIZEOF_SIZE_T 4
76+# endif
77+#endif
78+
79+#endif	/* ZEND_API */
80+
81+/*
82  * Local variables:
83  * tab-width: 4
84  * c-basic-offset: 4
85