1--- include/apr.h.in.orig 2011-09-13 17:22:40.000000000 -0700 2+++ include/apr.h.in 2011-09-13 17:24:02.000000000 -0700 3@@ -316,42 +316,8 @@ 4 5 #define APR_SIZEOF_VOIDP @voidp_size@ 6 7-/* 8- * Darwin 10's default compiler (gcc42) builds for both 64 and 9- * 32 bit architectures unless specifically told not to. 10- * In those cases, we need to override types depending on how 11- * we're being built at compile time. 12- * NOTE: This is an ugly work-around for Darwin's 13- * concept of universal binaries, a single package 14- * (executable, lib, etc...) which contains both 32 15- * and 64 bit versions. The issue is that if APR is 16- * built universally, if something else is compiled 17- * against it, some bit sizes will depend on whether 18- * it is 32 or 64 bit. This is determined by the __LP64__ 19- * flag. Since we need to support both, we have to 20- * handle OS X unqiuely. 21- */ 22-#ifdef DARWIN_10 23-#undef APR_SIZEOF_VOIDP 24-#undef INT64_C 25-#undef UINT64_C 26-#ifdef __LP64__ 27- typedef long apr_int64_t; 28- typedef unsigned long apr_uint64_t; 29- #define APR_SIZEOF_VOIDP 8 30- #define INT64_C(v) (v ## L) 31- #define UINT64_C(v) (v ## UL) 32-#else 33- typedef long long apr_int64_t; 34- typedef unsigned long long apr_uint64_t; 35- #define APR_SIZEOF_VOIDP 4 36- #define INT64_C(v) (v ## LL) 37- #define UINT64_C(v) (v ## ULL) 38-#endif 39-#else 40 typedef @long_value@ apr_int64_t; 41 typedef unsigned @long_value@ apr_uint64_t; 42-#endif 43 44 typedef @size_t_value@ apr_size_t; 45 typedef @ssize_t_value@ apr_ssize_t; 46@@ -534,43 +500,6 @@ 47 /* And APR_UINT64_T_HEX_FMT */ 48 @uint64_t_hex_fmt@ 49 50-/* 51- * Ensure we work with universal binaries on Darwin 52- */ 53-#ifdef DARWIN_10 54- 55-#undef APR_HAS_LARGE_FILES 56-#undef APR_SIZEOF_VOIDP 57-#undef APR_INT64_T_FMT 58-#undef APR_UINT64_T_FMT 59-#undef APR_UINT64_T_HEX_FMT 60- 61-#ifdef __LP64__ 62- #define APR_HAS_LARGE_FILES 0 63- #define APR_SIZEOF_VOIDP 8 64- #define APR_INT64_T_FMT "ld" 65- #define APR_UINT64_T_FMT "lu" 66- #define APR_UINT64_T_HEX_FMT "lx" 67-#else 68- #define APR_HAS_LARGE_FILES 1 69- #define APR_SIZEOF_VOIDP 4 70- #define APR_INT64_T_FMT "lld" 71- #define APR_UINT64_T_FMT "llu" 72- #define APR_UINT64_T_HEX_FMT "llx" 73-#endif 74- 75-#undef APR_IS_BIGENDIAN 76-#ifdef __BIG_ENDIAN__ 77- #define APR_IS_BIGENDIAN 1 78-#else 79- #define APR_IS_BIGENDIAN 0 80-#endif 81- 82-#undef APR_OFF_T_FMT 83-#define APR_OFF_T_FMT "lld" 84- 85-#endif /* DARWIN_10 */ 86- 87 /* Does the proc mutex lock threads too */ 88 #define APR_PROC_MUTEX_IS_GLOBAL @proc_mutex_is_global@ 89 90--- include/arch/unix/apr_private.h.in.orig 2011-09-13 17:22:49.000000000 -0700 91+++ include/arch/unix/apr_private.h.in 2011-09-13 17:23:11.000000000 -0700 92@@ -932,60 +932,6 @@ 93 #endif 94 95 /* 96- * Darwin 10's default compiler (gcc42) builds for both 64 and 97- * 32 bit architectures unless specifically told not to. 98- * In those cases, we need to override types depending on how 99- * we're being built at compile time. 100- * NOTE: This is an ugly work-around for Darwin's 101- * concept of universal binaries, a single package 102- * (executable, lib, etc...) which contains both 32 103- * and 64 bit versions. The issue is that if APR is 104- * built universally, if something else is compiled 105- * against it, some bit sizes will depend on whether 106- * it is 32 or 64 bit. This is determined by the __LP64__ 107- * flag. Since we need to support both, we have to 108- * handle OS X unqiuely. 109- */ 110-#ifdef DARWIN_10 111- 112-#undef APR_OFF_T_STRFN 113-#undef APR_INT64_STRFN 114-#undef SIZEOF_LONG 115-#undef SIZEOF_SIZE_T 116-#undef SIZEOF_SSIZE_T 117-#undef SIZEOF_VOIDP 118-#undef SIZEOF_STRUCT_IOVEC 119- 120-#ifdef __LP64__ 121- #define APR_INT64_STRFN strtol 122- #define SIZEOF_LONG 8 123- #define SIZEOF_SIZE_T 8 124- #define SIZEOF_SSIZE_T 8 125- #define SIZEOF_VOIDP 8 126- #define SIZEOF_STRUCT_IOVEC 16 127-#else 128- #define APR_INT64_STRFN strtoll 129- #define SIZEOF_LONG 4 130- #define SIZEOF_SIZE_T 4 131- #define SIZEOF_SSIZE_T 4 132- #define SIZEOF_VOIDP 4 133- #define SIZEOF_STRUCT_IOVEC 8 134-#endif 135- 136-#undef APR_OFF_T_STRFN 137-#define APR_OFF_T_STRFN APR_INT64_STRFN 138- 139- 140-#undef SETPGRP_VOID 141-#ifdef __DARWIN_UNIX03 142- #define SETPGRP_VOID 1 143-#else 144-/* #undef SETPGRP_VOID */ 145-#endif 146- 147-#endif /* DARWIN_10 */ 148- 149-/* 150 * Include common private declarations. 151 */ 152 #include "../apr_private_common.h" 153