diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2009-05-06 07:25:07 -0400 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2009-05-06 09:11:07 -0400 |
| commit | 938b230fa7b56218f8e423d1dedbdcc4bbb3b309 (patch) | |
| tree | 6231380ab3aebe48573a4fb9561bfdd50ff3a217 /src | |
| parent | f52e9c1aa8a5a265741ba509cba8c652f0e01e07 (diff) | |
| download | strongswan-938b230fa7b56218f8e423d1dedbdcc4bbb3b309.tar.bz2 strongswan-938b230fa7b56218f8e423d1dedbdcc4bbb3b309.tar.xz | |
renamed some conflicting function names
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/utils/mutex.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstrongswan/utils/mutex.c b/src/libstrongswan/utils/mutex.c index d73faf814..8b3a25201 100644 --- a/src/libstrongswan/utils/mutex.c +++ b/src/libstrongswan/utils/mutex.c @@ -313,7 +313,7 @@ mutex_t *mutex_create(mutex_type_t type) /** * Implementation of condvar_t.wait. */ -static void wait(private_condvar_t *this, private_mutex_t *mutex) +static void _wait(private_condvar_t *this, private_mutex_t *mutex) { if (mutex->recursive) { @@ -387,7 +387,7 @@ static bool timed_wait(private_condvar_t *this, private_mutex_t *mutex, /** * Implementation of condvar_t.signal. */ -static void signal(private_condvar_t *this) +static void _signal(private_condvar_t *this) { pthread_cond_signal(&this->condvar); } @@ -421,10 +421,10 @@ condvar_t *condvar_create(condvar_type_t type) { private_condvar_t *this = malloc_thing(private_condvar_t); - this->public.wait = (void(*)(condvar_t*, mutex_t *mutex))wait; + this->public.wait = (void(*)(condvar_t*, mutex_t *mutex))_wait; this->public.timed_wait = (bool(*)(condvar_t*, mutex_t *mutex, u_int timeout))timed_wait; this->public.timed_wait_abs = (bool(*)(condvar_t*, mutex_t *mutex, timeval_t time))timed_wait_abs; - this->public.signal = (void(*)(condvar_t*))signal; + this->public.signal = (void(*)(condvar_t*))_signal; this->public.broadcast = (void(*)(condvar_t*))broadcast; this->public.destroy = (void(*)(condvar_t*))condvar_destroy; |