----- Original Message ----- > On Feb 6, 2013, at 2:20 AM, iga...@apache.org wrote: > > > Updated Branches: > > refs/heads/master 61d0d2c11 -> 26c408071 > > > > > > cleanup ink_thread.h for TS-1698 > > > > All versions of FreeBSD support pthread_cancel() and > > pthread_getschedparam(). If there are any platforms out there that > > do > > not, this is a saner way to catch them. > > > > > > Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo > > Commit: > > http://git-wip-us.apache.org/repos/asf/trafficserver/commit/26c40807 > > Tree: > > http://git-wip-us.apache.org/repos/asf/trafficserver/tree/26c40807 > > Diff: > > http://git-wip-us.apache.org/repos/asf/trafficserver/diff/26c40807 > > > > Branch: refs/heads/master > > Commit: 26c408071d6a559bfb30da8a67854a4e888cfb71 > > Parents: 61d0d2c > > Author: Igor Galić <i.ga...@brainsware.org> > > Authored: Wed Feb 6 11:14:29 2013 +0100 > > Committer: Igor Galić <i.ga...@brainsware.org> > > Committed: Wed Feb 6 11:14:29 2013 +0100 > > > > ---------------------------------------------------------------------- > > lib/ts/ink_thread.h | 4 ++-- > > 1 files changed, 2 insertions(+), 2 deletions(-) > > ---------------------------------------------------------------------- > > > > > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/26c40807/lib/ts/ink_thread.h > > ---------------------------------------------------------------------- > > diff --git a/lib/ts/ink_thread.h b/lib/ts/ink_thread.h > > index b93dec3..efa3ed9 100644 > > --- a/lib/ts/ink_thread.h > > +++ b/lib/ts/ink_thread.h > > @@ -132,7 +132,7 @@ ink_thread_create(void *(*f) (void *), void *a, > > int detached = 0, size_t stacksi > > static inline void > > ink_thread_cancel(ink_thread who) > > { > > -#if defined(freebsd) > > +#if !defined(pthread_cancel) > > (void) who; > > ink_assert(!"not supported"); > > #else > > @@ -158,7 +158,7 @@ ink_thread_self() > > static inline int > > ink_thread_get_priority(ink_thread t, int *priority) > > { > > -#if defined(freebsd) > > +#if !defined(pthread_getschedparam) > > (void) t; > > (void) priority; > > ink_assert(!"not supported"); > > Who #defines pthread_cancel and pthread_getschedparam? > > J
Thanks for catching this non-sense. I'll revert/fix this asap. -- Igor Galić Tel: +43 (0) 664 886 22 883 Mail: i.ga...@brainsware.org URL: http://brainsware.org/ GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE
