From f94b090c8039b262c5c9712df9ad770a8bff2da6 Mon Sep 17 00:00:00 2001 From: Marcelo Roberto Jimenez Date: Sun, 13 Jan 2008 05:33:35 +0000 Subject: [PATCH] Putting back a "defined(__OSX__)" that has been removed in the previous *BSD patch. Thanks to Chris Pickel for pointing it out. git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@289 119443c7-1b9e-41f8-b6fc-b9c35fce742c --- ChangeLog | 3 +++ THANKS | 1 + threadutil/src/ThreadPool.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e7c0152..21dc7fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ Version 1.6.4 @name UPNP_E_UNSUBSCRIBE_UNACCAPTED [-302] Also, the documentation file name was mispelled and was corrected in the Makefile.am. +2008-01-07 Marcelo Jimenez + * Putting back a "defined(__OSX__)" that has been removed in the + previous *BSD patch. Thanks to Chris Pickel for pointing it out. ******************************************************************************* Version 1.6.3 diff --git a/THANKS b/THANKS index 751807a..3dbcc08 100644 --- a/THANKS +++ b/THANKS @@ -10,6 +10,7 @@ exempt of errors. - Arno Willig - Bob Ciora - Chaos +- Chris Pickel - Craig Nelson - David Maass - Emil Ljungdahl diff --git a/threadutil/src/ThreadPool.c b/threadutil/src/ThreadPool.c index 6734a58..ed48cec 100644 --- a/threadutil/src/ThreadPool.c +++ b/threadutil/src/ThreadPool.c @@ -389,7 +389,7 @@ static void SetSeed() gettimeofday(&t, NULL); #if defined(WIN32) srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id().p ); -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__OSX__) srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id() ); #elif defined(__linux__) srand( ( unsigned int )t.tv_usec + ithread_get_current_thread_id() );