On 12/01/2021 18:12, Manuel Bouyer wrote: > From: Manuel Bouyer <bou...@netbsd.org> > > On NetBSD, PTHREAD_STACK_MIN is not available. > Just use DEFAULT_THREAD_STACKSIZE if PTHREAD_STACK_MIN is not available. > > Signed-off-by: Manuel Bouyer <bou...@netbsd.org> > --- > tools/libs/store/xs.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/tools/libs/store/xs.c b/tools/libs/store/xs.c > index 4ac73ec317..8e646b98d6 100644 > --- a/tools/libs/store/xs.c > +++ b/tools/libs/store/xs.c > @@ -811,9 +811,13 @@ bool xs_watch(struct xs_handle *h, const char *path, > const char *token) > > #ifdef USE_PTHREAD > #define DEFAULT_THREAD_STACKSIZE (16 * 1024) > +#ifndef PTHREAD_STACK_MIN > +#define READ_THREAD_STACKSIZE DEFAULT_THREAD_STACKSIZE > +#else > #define READ_THREAD_STACKSIZE \ > ((DEFAULT_THREAD_STACKSIZE < PTHREAD_STACK_MIN) ? \ > PTHREAD_STACK_MIN : DEFAULT_THREAD_STACKSIZE) > +#endif
How about this: diff --git a/tools/libs/store/xs.c b/tools/libs/store/xs.c index 4ac73ec317..3fa3abdeca 100644 --- a/tools/libs/store/xs.c +++ b/tools/libs/store/xs.c @@ -811,9 +811,14 @@ bool xs_watch(struct xs_handle *h, const char *path, const char *token) #ifdef USE_PTHREAD #define DEFAULT_THREAD_STACKSIZE (16 * 1024) -#define READ_THREAD_STACKSIZE \ - ((DEFAULT_THREAD_STACKSIZE < PTHREAD_STACK_MIN) ? \ - PTHREAD_STACK_MIN : DEFAULT_THREAD_STACKSIZE) + +/* NetBSD doesn't have PTHREAD_STACK_MIN. */ +#ifndef PTHREAD_STACK_MIN +# define PTHREAD_STACK_MIN 0 +#endif + +#define READ_THREAD_STACKSIZE \ + MAX(PTHREAD_STACK_MIN, DEFAULT_THREAD_STACKSIZE) /* We dynamically create a reader thread on demand. */ mutex_lock(&h->request_mutex); which makes things rather clearer IMO. ~Andrew
