[svn-commits] kpfleming: branch kpfleming/symbol-namespace-cleanup r180189 - in /team/kpfle...

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Wed Mar  4 11:44:16 2009
New Revision: 180189

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180189
Log:
make ao2 API prefixes consistent

Modified:
    team/kpfleming/symbol-namespace-cleanup/include/asterisk/astobj2.h
    team/kpfleming/symbol-namespace-cleanup/main/astobj2.c

Modified: team/kpfleming/symbol-namespace-cleanup/include/asterisk/astobj2.h
URL: http://svn.digium.com/svn-view/asterisk/team/kpfleming/symbol-namespace-cleanup/include/asterisk/astobj2.h?view=diff&rev=180189&r1=180188&r2=180189
==============================================================================
--- team/kpfleming/symbol-namespace-cleanup/include/asterisk/astobj2.h (original)
+++ team/kpfleming/symbol-namespace-cleanup/include/asterisk/astobj2.h Wed Mar  4 11:44:16 2009
@@ -188,15 +188,15 @@
 #ifndef DEBUG_THREADS
 int ao2_lock(void *a);
 #else
-#define ao2_lock(a) _ao2_lock(a, __FILE__, __PRETTY_FUNCTION__, __LINE__, #a)
-int _ao2_lock(void *a, const char *file, const char *func, int line, const char *var);
+#define ao2_lock(a) __ao2_lock(a, __FILE__, __PRETTY_FUNCTION__, __LINE__, #a)
+int __ao2_lock(void *a, const char *file, const char *func, int line, const char *var);
 #endif
 
 #ifndef DEBUG_THREADS
 int ao2_trylock(void *a);
 #else
-#define ao2_trylock(a) _ao2_trylock(a, __FILE__, __PRETTY_FUNCTION__, __LINE__, #a)
-int _ao2_trylock(void *a, const char *file, const char *func, int line, const char *var);
+#define ao2_trylock(a) __ao2_trylock(a, __FILE__, __PRETTY_FUNCTION__, __LINE__, #a)
+int __ao2_trylock(void *a, const char *file, const char *func, int line, const char *var);
 #endif
 
 /*!
@@ -208,8 +208,8 @@
 #ifndef DEBUG_THREADS
 int ao2_unlock(void *a);
 #else
-#define ao2_unlock(a) _ao2_unlock(a, __FILE__, __PRETTY_FUNCTION__, __LINE__, #a)
-int _ao2_unlock(void *a, const char *file, const char *func, int line, const char *var);
+#define ao2_unlock(a) __ao2_unlock(a, __FILE__, __PRETTY_FUNCTION__, __LINE__, #a)
+int __ao2_unlock(void *a, const char *file, const char *func, int line, const char *var);
 #endif
 
 /*!

Modified: team/kpfleming/symbol-namespace-cleanup/main/astobj2.c
URL: http://svn.digium.com/svn-view/asterisk/team/kpfleming/symbol-namespace-cleanup/main/astobj2.c?view=diff&rev=180189&r1=180188&r2=180189
==============================================================================
--- team/kpfleming/symbol-namespace-cleanup/main/astobj2.c (original)
+++ team/kpfleming/symbol-namespace-cleanup/main/astobj2.c Wed Mar  4 11:44:16 2009
@@ -128,7 +128,7 @@
 #ifndef DEBUG_THREADS
 int ao2_lock(void *user_data)
 #else
-int _ao2_lock(void *user_data, const char *file, const char *func, int line, const char *var)
+int __ao2_lock(void *user_data, const char *file, const char *func, int line, const char *var)
 #endif
 {
 	struct astobj2 *p = INTERNAL_OBJ(user_data);
@@ -150,7 +150,7 @@
 #ifndef DEBUG_THREADS
 int ao2_trylock(void *user_data)
 #else
-int _ao2_trylock(void *user_data, const char *file, const char *func, int line, const char *var)
+int __ao2_trylock(void *user_data, const char *file, const char *func, int line, const char *var)
 #endif
 {
 	struct astobj2 *p = INTERNAL_OBJ(user_data);
@@ -177,7 +177,7 @@
 #ifndef DEBUG_THREADS
 int ao2_unlock(void *user_data)
 #else
-int _ao2_unlock(void *user_data, const char *file, const char *func, int line, const char *var)
+int __ao2_unlock(void *user_data, const char *file, const char *func, int line, const char *var)
 #endif
 {
 	struct astobj2 *p = INTERNAL_OBJ(user_data);