OpenSolaris defines MUTEX_DEFAULT therefore we rename the members of the enums mutex/condvar/rwlock_type_t.
This commit is contained in:
@@ -1972,7 +1972,7 @@ kernel_netlink_ipsec_t *kernel_netlink_ipsec_create()
|
||||
/* private members */
|
||||
this->policies = hashtable_create((hashtable_hash_t)policy_hash,
|
||||
(hashtable_equals_t)policy_equals, 32);
|
||||
this->mutex = mutex_create(MUTEX_DEFAULT);
|
||||
this->mutex = mutex_create(MUTEX_TYPE_DEFAULT);
|
||||
this->install_routes = lib->settings->get_bool(lib->settings,
|
||||
"charon.install_routes", TRUE);
|
||||
|
||||
|
||||
@@ -1370,8 +1370,8 @@ kernel_netlink_net_t *kernel_netlink_net_create()
|
||||
|
||||
/* private members */
|
||||
this->ifaces = linked_list_create();
|
||||
this->mutex = mutex_create(MUTEX_DEFAULT);
|
||||
this->condvar = condvar_create(CONDVAR_DEFAULT);
|
||||
this->mutex = mutex_create(MUTEX_TYPE_DEFAULT);
|
||||
this->condvar = condvar_create(CONDVAR_TYPE_DEFAULT);
|
||||
timerclear(&this->last_roam);
|
||||
this->routing_table = lib->settings->get_int(lib->settings,
|
||||
"charon.routing_table", IPSEC_ROUTING_TABLE);
|
||||
|
||||
@@ -255,7 +255,7 @@ netlink_socket_t *netlink_socket_create(int protocol) {
|
||||
|
||||
/* private members */
|
||||
this->seq = 200;
|
||||
this->mutex = mutex_create(MUTEX_DEFAULT);
|
||||
this->mutex = mutex_create(MUTEX_TYPE_DEFAULT);
|
||||
|
||||
memset(&addr, 0, sizeof(addr));
|
||||
addr.nl_family = AF_NETLINK;
|
||||
|
||||
Reference in New Issue
Block a user