diff --git a/libs/apr/.update b/libs/apr/.update
index 7c125ac53c..274a4b5e2e 100644
--- a/libs/apr/.update
+++ b/libs/apr/.update
@@ -1 +1 @@
-Tue May 19 13:49:44 EDT 2009
+Mon Jun  8 11:30:01 EDT 2009
diff --git a/libs/apr/build/apr_threads.m4 b/libs/apr/build/apr_threads.m4
index e111ff0212..2bf66a5eac 100644
--- a/libs/apr/build/apr_threads.m4
+++ b/libs/apr/build/apr_threads.m4
@@ -224,7 +224,10 @@ AC_DEFUN(APR_CHECK_SIGWAIT_ONE_ARG,[
 dnl Check for recursive mutex support (per SUSv3).
 AC_DEFUN([APR_CHECK_PTHREAD_RECURSIVE_MUTEX], [
   AC_CACHE_CHECK([for recursive mutex support], [apr_cv_mutex_recursive],
-[AC_TRY_RUN([#define _XOPEN_SOURCE 600
+[AC_TRY_RUN([
+#ifndef __sun
+#define _XOPEN_SOURCE 600
+#endif
 #include <sys/types.h>
 #include <pthread.h>
 #include <stdlib.h>
diff --git a/libs/apr/include/arch/unix/apr_arch_proc_mutex.h b/libs/apr/include/arch/unix/apr_arch_proc_mutex.h
index b836829ecc..a307d94657 100644
--- a/libs/apr/include/arch/unix/apr_arch_proc_mutex.h
+++ b/libs/apr/include/arch/unix/apr_arch_proc_mutex.h
@@ -17,9 +17,11 @@
 #ifndef PROC_MUTEX_H
 #define PROC_MUTEX_H
 
+#ifndef __sun
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 600
 #endif
+#endif
 
 #include "apr.h"
 #include "apr_private.h"
diff --git a/libs/apr/include/arch/unix/apr_arch_thread_mutex.h b/libs/apr/include/arch/unix/apr_arch_thread_mutex.h
index 08ea248ea8..0f9798701e 100644
--- a/libs/apr/include/arch/unix/apr_arch_thread_mutex.h
+++ b/libs/apr/include/arch/unix/apr_arch_thread_mutex.h
@@ -17,9 +17,11 @@
 #ifndef THREAD_MUTEX_H
 #define THREAD_MUTEX_H
 
+#ifndef __sun
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 600
 #endif
+#endif
 
 #include "apr.h"
 #include "apr_private.h"