Author: mikej Date: Mon Jun 8 10:32:35 2009 New Revision: 13671 Log: fix solaris build (FSBUILD-169) Modified: freeswitch/trunk/libs/apr/.update freeswitch/trunk/libs/apr/build/apr_threads.m4 freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_proc_mutex.h freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_thread_mutex.h Modified: freeswitch/trunk/libs/apr/.update ============================================================================== --- freeswitch/trunk/libs/apr/.update (original) +++ freeswitch/trunk/libs/apr/.update Mon Jun 8 10:32:35 2009 @@ -1 +1 @@ -Tue May 19 13:49:44 EDT 2009 +Mon Jun 8 11:30:01 EDT 2009 Modified: freeswitch/trunk/libs/apr/build/apr_threads.m4 ============================================================================== --- freeswitch/trunk/libs/apr/build/apr_threads.m4 (original) +++ freeswitch/trunk/libs/apr/build/apr_threads.m4 Mon Jun 8 10:32:35 2009 @@ -224,7 +224,10 @@ 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> Modified: freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_proc_mutex.h ============================================================================== --- freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_proc_mutex.h (original) +++ freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_proc_mutex.h Mon Jun 8 10:32:35 2009 @@ -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" Modified: freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_thread_mutex.h ============================================================================== --- freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_thread_mutex.h (original) +++ freeswitch/trunk/libs/apr/include/arch/unix/apr_arch_thread_mutex.h Mon Jun 8 10:32:35 2009 @@ -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"