Browse Source

Fix configure test for pthread recursive mutex.

tags/v1.3.1000
Jonathan Moore Liles 12 years ago
parent
commit
fcb6807e9e
2 changed files with 8 additions and 3 deletions
  1. +3
    -3
      src/Fl_lock.cxx
  2. +5
    -0
      wscript

+ 3
- 3
src/Fl_lock.cxx View File

@@ -284,7 +284,7 @@ static void unlock_function_std() {
if (!--counter) pthread_mutex_unlock(&fltk_mutex);
}

# ifdef PTHREAD_MUTEX_RECURSIVE
# ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
static bool lock_function_init_rec() {
pthread_mutexattr_t attrib;
pthread_mutexattr_init(&attrib);
@@ -352,7 +352,7 @@ int Fl::lock() {

// Set lock/unlock functions for this system, using a system-supplied
// recursive mutex if supported...
# ifdef PTHREAD_MUTEX_RECURSIVE
# ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
if (!lock_function_init_rec()) {
fl_lock_function = lock_function_rec;
fl_unlock_function = unlock_function_rec;
@@ -361,7 +361,7 @@ int Fl::lock() {
lock_function_init_std();
fl_lock_function = lock_function_std;
fl_unlock_function = unlock_function_std;
# ifdef PTHREAD_MUTEX_RECURSIVE
# ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
}
# endif // PTHREAD_MUTEX_RECURSIVE
}


+ 5
- 0
wscript View File

@@ -74,6 +74,11 @@ def configure(conf):
conf.check(header_name='pthread.h', define_name='HAVE_PTHREAD', mandatory=True)
conf.check(header_name='png.h', define_name='HAVE_PNG_H', mandatory=False)

conf.check(features='c cprogram',
fragment='#include <pthread.h>\nint main ( int argc, const char **argv ) { return PTHREAD_MUTEX_RECURSIVE; }\n',
execute = False,
define_name='HAVE_PTHREAD_MUTEX_RECURSIVE', mandatory=False,
msg='Checking for PTHREAD_MUTEX_RECURSIVE')
# conf.check(function_name='jpeg_CreateCompress', header_name='jpeglib.h', use='jpeg', define_name='HAVE_LIBJPEG', mandatory=False)

if Options.options.ENABLE_TEST:


Loading…
Cancel
Save