Merged revisions 114051 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114051 | mmichelson | 2008-04-10 15:59:49 -0500 (Thu, 10 Apr 2008) | 3 lines

Fix 1.4 build when LOW_MEMORY is enabled.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-04-10 22:02:32 +00:00
parent a08c4b2064
commit 115d5024a1
10 changed files with 58 additions and 11 deletions

View File

@@ -148,18 +148,31 @@ enum ast_lock_type {
* lock info struct. The lock is marked as pending as the thread is waiting
* on the lock. ast_mark_lock_acquired() will mark it as held by this thread.
*/
#if !defined(LOW_MEMORY)
void ast_store_lock_info(enum ast_lock_type type, const char *filename,
int line_num, const char *func, const char *lock_name, void *lock_addr);
#else
#define ast_store_lock_info(I,DONT,CARE,ABOUT,THE,PARAMETERS)
#endif
/*!
* \brief Mark the last lock as acquired
*/
#if !defined(LOW_MEMORY)
void ast_mark_lock_acquired(void *lock_addr);
#else
#define ast_mark_lock_acquired(ignore)
#endif
/*!
* \brief Mark the last lock as failed (trylock)
*/
#if !defined(LOW_MEMORY)
void ast_mark_lock_failed(void *lock_addr);
#else
#define ast_mark_lock_failed(ignore)
#endif
/*!
* \brief remove lock info for the current thread
@@ -167,7 +180,11 @@ void ast_mark_lock_failed(void *lock_addr);
* this gets called by ast_mutex_unlock so that information on the lock can
* be removed from the current thread's lock info struct.
*/
#if !defined(LOW_MEMORY)
void ast_remove_lock_info(void *lock_addr);
#else
#define ast_remove_lock_info(ignore)
#endif
static void __attribute__((constructor)) init_empty_mutex(void)
{