提交 354305a1 authored 作者: Michael Jerris's avatar Michael Jerris

avoid namespace collision with cepstral.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4502 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 9263ef1f
Mon Feb 19 12:03:56 EST 2007
\ No newline at end of file
Sat Mar 10 12:59:56 EST 2007
\ No newline at end of file
......@@ -5,15 +5,15 @@
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so.
*
* This work is provided under this license on an "as is" basis, without warranty of any kind,
* either expressed or implied, including, without limitation, warranties that the covered code
* is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire
* risk as to the quality and performance of the covered code is with you. Should any covered
* code prove defective in any respect, you (not the initial developer or any other contributor)
* assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty
* constitutes an essential part of this license. No use of any covered code is authorized hereunder
* except under this disclaimer.
*
* This work is provided under this license on an "as is" basis, without warranty of any kind,
* either expressed or implied, including, without limitation, warranties that the covered code
* is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire
* risk as to the quality and performance of the covered code is with you. Should any covered
* code prove defective in any respect, you (not the initial developer or any other contributor)
* assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty
* constitutes an essential part of this license. No use of any covered code is authorized hereunder
* except under this disclaimer.
*
*/
......@@ -38,68 +38,68 @@ struct mutex {
#endif
mutex_status_t mutex_create(mutex_t **mutex)
{
mutex_t *check = NULL;
check = (mutex_t *)malloc(sizeof(**mutex));
if (!check)
return MUTEX_FAILURE;
#ifdef WIN32
InitializeCriticalSection(&check->mutex);
#else
if (pthread_mutex_init(&check->mutex, NULL))
return MUTEX_FAILURE;
#endif
*mutex = check;
return MUTEX_SUCCESS;
}
mutex_status_t mutex_destroy(mutex_t *mutex)
{
#ifdef WIN32
DeleteCriticalSection(&mutex->mutex);
#else
if (pthread_mutex_destroy(&mutex->mutex))
return MUTEX_FAILURE;
#endif
free(mutex);
return MUTEX_SUCCESS;
}
mutex_status_t mutex_lock(mutex_t *mutex)
{
#ifdef WIN32
EnterCriticalSection(&mutex->mutex);
#else
if (pthread_mutex_lock(&mutex->mutex))
return MUTEX_FAILURE;
#endif
return MUTEX_SUCCESS;
}
mutex_status_t mutex_trylock(mutex_t *mutex)
{
#ifdef WIN32
if (!TryEnterCriticalSection(&mutex->mutex))
return MUTEX_FAILURE;
#else
if (pthread_mutex_trylock(&mutex->mutex))
return MUTEX_FAILURE;
#endif
return MUTEX_SUCCESS;
}
mutex_status_t mutex_unlock(mutex_t *mutex)
{
#ifdef WIN32
LeaveCriticalSection(&mutex->mutex);
#else
if (pthread_mutex_unlock(&mutex->mutex))
return MUTEX_FAILURE;
#endif
return MUTEX_SUCCESS;
}
mutex_status_t iax_mutex_create(mutex_t **mutex)
{
mutex_t *check = NULL;
check = (mutex_t *)malloc(sizeof(**mutex));
if (!check)
return MUTEX_FAILURE;
#ifdef WIN32
InitializeCriticalSection(&check->mutex);
#else
if (pthread_mutex_init(&check->mutex, NULL))
return MUTEX_FAILURE;
#endif
*mutex = check;
return MUTEX_SUCCESS;
}
mutex_status_t iax_mutex_destroy(mutex_t *mutex)
{
#ifdef WIN32
DeleteCriticalSection(&mutex->mutex);
#else
if (pthread_mutex_destroy(&mutex->mutex))
return MUTEX_FAILURE;
#endif
free(mutex);
return MUTEX_SUCCESS;
}
mutex_status_t iax_mutex_lock(mutex_t *mutex)
{
#ifdef WIN32
EnterCriticalSection(&mutex->mutex);
#else
if (pthread_mutex_lock(&mutex->mutex))
return MUTEX_FAILURE;
#endif
return MUTEX_SUCCESS;
}
mutex_status_t iax_mutex_trylock(mutex_t *mutex)
{
#ifdef WIN32
if (!TryEnterCriticalSection(&mutex->mutex))
return MUTEX_FAILURE;
#else
if (pthread_mutex_trylock(&mutex->mutex))
return MUTEX_FAILURE;
#endif
return MUTEX_SUCCESS;
}
mutex_status_t iax_mutex_unlock(mutex_t *mutex)
{
#ifdef WIN32
LeaveCriticalSection(&mutex->mutex);
#else
if (pthread_mutex_unlock(&mutex->mutex))
return MUTEX_FAILURE;
#endif
return MUTEX_SUCCESS;
}
......@@ -5,33 +5,33 @@
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so.
*
* This work is provided under this license on an "as is" basis, without warranty of any kind,
* either expressed or implied, including, without limitation, warranties that the covered code
* is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire
* risk as to the quality and performance of the covered code is with you. Should any covered
* code prove defective in any respect, you (not the initial developer or any other contributor)
* assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty
* constitutes an essential part of this license. No use of any covered code is authorized hereunder
* except under this disclaimer.
*
* This work is provided under this license on an "as is" basis, without warranty of any kind,
* either expressed or implied, including, without limitation, warranties that the covered code
* is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire
* risk as to the quality and performance of the covered code is with you. Should any covered
* code prove defective in any respect, you (not the initial developer or any other contributor)
* assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty
* constitutes an essential part of this license. No use of any covered code is authorized hereunder
* except under this disclaimer.
*
*/
#ifndef _SIMPLE_ABSTRACT_MUTEX_H
#define _SIMPLE_ABSTRACT_MUTEX_H
typedef struct mutex mutex_t;
typedef enum mutex_status {
MUTEX_SUCCESS,
MUTEX_FAILURE
} mutex_status_t;
mutex_status_t mutex_create(mutex_t **mutex);
mutex_status_t mutex_destroy(mutex_t *mutex);
mutex_status_t mutex_lock(mutex_t *mutex);
mutex_status_t mutex_trylock(mutex_t *mutex);
mutex_status_t mutex_unlock(mutex_t *mutex);
#endif
#ifndef _SIMPLE_ABSTRACT_MUTEX_H
#define _SIMPLE_ABSTRACT_MUTEX_H
typedef struct mutex mutex_t;
typedef enum mutex_status {
MUTEX_SUCCESS,
MUTEX_FAILURE
} mutex_status_t;
mutex_status_t iax_mutex_create(mutex_t **mutex);
mutex_status_t iax_mutex_destroy(mutex_t *mutex);
mutex_status_t iax_mutex_lock(mutex_t *mutex);
mutex_status_t iax_mutex_trylock(mutex_t *mutex);
mutex_status_t iax_mutex_unlock(mutex_t *mutex);
#endif
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论