From f22a69b48703634c56dfeb25f1423378549826aa Mon Sep 17 00:00:00 2001 From: Marcelo Roberto Jimenez Date: Thu, 24 Jul 2008 11:30:42 +0000 Subject: [PATCH] Backport of 457: SF Bug Tracker [ 2026431 ] pupnp does not build on GNU/KfreeBSD. Submitted By: Nick Leverton - leveret Gnu/KFreeBSD is one of the Debian architectures, it includes a FreeBSD kernel with GNU userspace (glibc etc). The Gnu/KfreeBSD developers provided the attached patch to test the appropriate #define and allow pupnp to build in their environment, and asked me to forward it to you. Since the test is a simple check for defined(__GLIBC__), this would presumably also help with other ports of GNU libc to non-Linux kernels. git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.6.x@458 119443c7-1b9e-41f8-b6fc-b9c35fce742c --- ChangeLog | 11 +++++++++++ THANKS | 2 ++ threadutil/src/ThreadPool.c | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index eee8f6f..b6b8258 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,17 @@ Version 1.6.7 ******************************************************************************* +2008-06-30 Marcelo Jimenez + * SF Bug Tracker [ 2026431 ] pupnp does not build on GNU/KfreeBSD. + Submitted By: Nick Leverton - leveret + Gnu/KFreeBSD is one of the Debian architectures, it includes a FreeBSD + kernel with GNU userspace (glibc etc). The Gnu/KfreeBSD developers + provided the attached patch to test the appropriate #define and allow pupnp + to build in their environment, and asked me to forward it to you. + + Since the test is a simple check for defined(__GLIBC__), this would + presumably also help with other ports of GNU libc to non-Linux kernels. + 2008-06-30 Marcelo Jimenez * Added an m4 macro to deal with finding libupnp in the users' configure script. diff --git a/THANKS b/THANKS index a917e4f..6aac1e8 100644 --- a/THANKS +++ b/THANKS @@ -37,6 +37,8 @@ exempt of errors. - Marcelo Roberto Jimenez (mroberto) - Markus Strobl - Nektarios K. Papadopoulos (npapadop) +- Nicholas Kraft +- Nick Leverton (leveret) - Oskar Liljeblad - Michael (oxygenic) - Paul Vixie diff --git a/threadutil/src/ThreadPool.c b/threadutil/src/ThreadPool.c index 2a9a0a7..9ed4d86 100644 --- a/threadutil/src/ThreadPool.c +++ b/threadutil/src/ThreadPool.c @@ -391,7 +391,7 @@ static void SetSeed() srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id().p ); #elif defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__) srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id() ); -#elif defined(__linux__) || defined(__sun) || defined(__CYGWIN__) +#elif defined(__linux__) || defined(__sun) || defined(__CYGWIN__) || defined(__GLIBC__) srand( ( unsigned int )t.tv_usec + ithread_get_current_thread_id() ); #else {