casa-mp-base

--- include/apr.h.in.orig   2011-06-09 13:31:47.000000000 -0400

+++ include/apr.h.in    2011-06-09 13:31:25.000000000 -0400

@@ -331,7 +331,7 @@

  * flag. Since we need to support both, we have to

  * handle OS X unqiuely.

  */

+#ifdef DARWIN

-#ifdef DARWIN_10

 #undef APR_SIZEOF_VOIDP

 #undef INT64_C

 #undef UINT64_C

@@ -537,7 +537,7 @@

 /*

  * Ensure we work with universal binaries on Darwin

  */

+#ifdef DARWIN

-#ifdef DARWIN_10

 #undef APR_HAS_LARGE_FILES

 #undef APR_SIZEOF_VOIDP

@@ -569,7 +569,7 @@

 #undef APR_OFF_T_FMT

 #define APR_OFF_T_FMT "lld"

+#endif /* DARWIN */

-#endif /* DARWIN_10 */

 /* Does the proc mutex lock threads too */

 #define APR_PROC_MUTEX_IS_GLOBAL      @proc_mutex_is_global@

--- include/arch/unix/apr_private.h.in.orig 2011-06-09 13:32:21.000000000 -0400

+++ include/arch/unix/apr_private.h.in  2011-06-09 13:31:59.000000000 -0400

@@ -946,7 +946,7 @@

  * flag. Since we need to support both, we have to

  * handle OS X unqiuely.

  */

+#ifdef DARWIN

-#ifdef DARWIN_10

 #undef APR_OFF_T_STRFN

 #undef APR_INT64_STRFN

@@ -983,7 +983,7 @@

 /* #undef SETPGRP_VOID */

 #endif

+#endif /* DARWIN */

-#endif /* DARWIN_10 */

 /*

  * Include common private declarations.