Hi Matt,
Your suggestion will probably work as it is. I used it as a basis to
create the patch below, which is in my opinion slightly cleaner. If
nobody complains, I could commit this.
BR,
Roel
PS. Try not to mail those 'winmail.dat' files... It's kind of difficult
to read your mail without Outlook.
Index: common/slp_thread.c
===================================================================
--- common/slp_thread.c (revision 1669)
+++ common/slp_thread.c (working copy)
@@ -118,11 +118,15 @@
pthread_mutexattr_t attr;
if (pthread_mutexattr_init(&attr) == 0)
{
-#if defined(__USE_UNIX98) || defined(DARWIN)
+#ifdef HAVE_PTHREAD_MUTEXATTR_SETTYPE
(void)pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
#else
+#ifdef HAVE_PTHREAD_MUTEXATTR_SETKIND_NP
(void)pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
-#endif
+#else
+#warning "Don't know how to make mutex recursive"
+#endif /* HAVE_PTHREAD_MUTEXATTR_SETKIND_NP */
+#endif /* HAVE_PTHREAD_MUTEXATTR_SETTYPE */
mutex = (pthread_mutex_t *)xmalloc(sizeof(*mutex));
if (mutex != 0&& pthread_mutex_init(mutex,&attr) != 0)
{
Index: configure.ac
===================================================================
--- configure.ac (revision 1669)
+++ configure.ac (working copy)
@@ -78,6 +78,7 @@
AC_FUNC_SELECT_ARGTYPES
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([strchr memcpy strcasecmp strdup strtol strerror isascii alarm
gethostname gettimeofday select socket])
+AC_CHECK_FUNCS([pthread_mutexattr_settype pthread_mutexattr_setkind_np])
#
# SLPv1 support - default is ON
On 05/03/2011 01:28 PM, Matthew Pendlebury wrote:
> Consider the environment before printing this mail.
>
> Thales e-Security Limited is incorporated in England and Wales with company
> registration number 2518805. Its registered office is located at 2 Dashwood
> Lang Road, The Bourne Business Park, Addlestone, Nr. Weybridge, Surrey KT15
> 2NX.
>
> The information contained in this e-mail is confidential. It may also be
> privileged. It is intended only for the stated addressee(s) and access to it
> by any other person is unauthorised. If you are not an addressee or the
> intended addressee, you must not disclose, copy, circulate or in any other
> way use or rely on the information contained in this e-mail. Such
> unauthorised use may be unlawful. If you have received this e-mail in error,
> please inform us immediately on +44 (0)1223 723600 and delete it and all
> copies from your system. Commercial matters detailed or referred to in this
> e-mail are subject to a written contract signed for and on behalf of Thales
> e-Security Limited.
>
>
> ------------------------------------------------------------------------------
> WhatsUp Gold - Download Free Network Management Software
> The most intuitive, comprehensive, and cost-effective network
> management toolset available today. Delivers lowest initial
> acquisition cost and overall TCO of any competing solution.
> http://p.sf.net/sfu/whatsupgold-sd
>
>
> _______________________________________________
> Openslp-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/openslp-devel
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Openslp-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openslp-devel
