[Freeswitch-svn] [commit] r4502 - in freeswitch/trunk/libs/iax: . src

[Freeswitch SVN]

Author: mikej
Date: Sat Mar 10 12:51:20 2007
New Revision: 4502

Modified:
   freeswitch/trunk/libs/iax/.update
   freeswitch/trunk/libs/iax/src/iax-mutex.c
   freeswitch/trunk/libs/iax/src/iax-mutex.h

Log:
avoid namespace collision with cepstral.

Modified: freeswitch/trunk/libs/iax/.update
==============================================================================
--- freeswitch/trunk/libs/iax/.update	(original)
+++ freeswitch/trunk/libs/iax/.update	Sat Mar 10 12:51:20 2007
@@ -1 +1 @@
-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

Modified: freeswitch/trunk/libs/iax/src/iax-mutex.c
==============================================================================
--- freeswitch/trunk/libs/iax/src/iax-mutex.c	(original)
+++ freeswitch/trunk/libs/iax/src/iax-mutex.c	Sat Mar 10 12:51:20 2007
@@ -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 @@
 #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;
+}

Modified: freeswitch/trunk/libs/iax/src/iax-mutex.h
==============================================================================
--- freeswitch/trunk/libs/iax/src/iax-mutex.h	(original)
+++ freeswitch/trunk/libs/iax/src/iax-mutex.h	Sat Mar 10 12:51:20 2007
@@ -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