@@ -1,3 +1,9 @@ +Release 2.2.6 +------------- + + * Fixed a compilation problem on Solaris. Issue #369. + + Release 2.2.5 ------------- @@ -134,4 +140,4 @@ Release 2.2.5 Older releases -------------- -Please consult the blog posts on http://blog.phusion.nl/ for the information about older releases. \ No newline at end of file +Please consult the blog posts on http://blog.phusion.nl/ for the information about older releases. NEWS @@ -109,15 +109,6 @@ private: public: /** - * The platform's minimum stack size, in bytes. - */ - #if defined(PTHREAD_STACK_MIN) - static const unsigned int MIN_STACK_SIZE = PTHREAD_STACK_MIN; - #else - static const unsigned int MIN_STACK_SIZE = 1024 * 128; - #endif - - /** * Create a new thread. * * @param func A function object which will be called as the thread's @@ -139,8 +130,18 @@ public: initialize_data(name); set_thread_main_function(boost::bind(thread_main, func, data)); - if (stack_size < MIN_STACK_SIZE) { - stack_size = MIN_STACK_SIZE; + + unsigned long min_stack_size; + #ifdef PTHREAD_STACK_MIN + // PTHREAD_STACK_MIN may not be a constant macro so we need + // to evaluate it dynamically. + min_stack_size = PTHREAD_STACK_MIN; + #else + // Assume minimum stack size is 128 KB. + min_stack_size = 128 * 1024; + #endif + if (stack_size < min_stack_size) { + stack_size = min_stack_size; } start_thread(stack_size); } ext/oxt/thread.hpp 17790317ac97dfd57b63ddba1e99daeb3740e042 Hongli Lai (Phusion) hongli@phusion.nl http://github.com/FooBarWidget/passenger/commit/5f3ac2b07dcca61321a3cecff666b439a725a3db 5f3ac2b07dcca61321a3cecff666b439a725a3db 2009-09-04T01:36:45-07:00 2009-09-04T01:36:08-07:00 Fix compilation on Solaris: PTHREAD_STACK_MIN might not be a constant, so evaluate it dynamically. Fixes issue #369. 5b65329ab58d43819bbb62574187fda9e3db3fb6 Hongli Lai (Phusion) hongli@phusion.nl