OpenSolaris defines MUTEX_DEFAULT therefore we rename the members of the enums mutex/condvar/rwlock_type_t.
This commit is contained in:
@@ -47,7 +47,7 @@ struct private_gcrypt_plugin_t {
|
||||
*/
|
||||
static int mutex_init(void **lock)
|
||||
{
|
||||
*lock = mutex_create(MUTEX_DEFAULT);
|
||||
*lock = mutex_create(MUTEX_TYPE_DEFAULT);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -686,7 +686,7 @@ mysql_database_t *mysql_database_create(char *uri)
|
||||
free(this);
|
||||
return NULL;
|
||||
}
|
||||
this->mutex = mutex_create(MUTEX_DEFAULT);
|
||||
this->mutex = mutex_create(MUTEX_TYPE_DEFAULT);
|
||||
this->pool = linked_list_create();
|
||||
|
||||
/* check connectivity */
|
||||
|
||||
@@ -84,7 +84,7 @@ static struct CRYPTO_dynlock_value *create_function(const char *file, int line)
|
||||
struct CRYPTO_dynlock_value *lock;
|
||||
|
||||
lock = malloc_thing(struct CRYPTO_dynlock_value);
|
||||
lock->mutex = mutex_create(MUTEX_DEFAULT);
|
||||
lock->mutex = mutex_create(MUTEX_TYPE_DEFAULT);
|
||||
return lock;
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ static void threading_init()
|
||||
mutex = malloc(sizeof(mutex_t*) * num_locks);
|
||||
for (i = 0; i < num_locks; i++)
|
||||
{
|
||||
mutex[i] = mutex_create(MUTEX_DEFAULT);
|
||||
mutex[i] = mutex_create(MUTEX_TYPE_DEFAULT);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -333,7 +333,7 @@ sqlite_database_t *sqlite_database_create(char *uri)
|
||||
this->public.db.get_driver = (db_driver_t(*)(database_t*))get_driver;
|
||||
this->public.db.destroy = (void(*)(database_t*))destroy;
|
||||
|
||||
this->mutex = mutex_create(MUTEX_RECURSIVE);
|
||||
this->mutex = mutex_create(MUTEX_TYPE_RECURSIVE);
|
||||
|
||||
if (sqlite3_open(file, &this->db) != SQLITE_OK)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user