diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-10 22:23:14 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-10 22:23:14 +0000 |
commit | 189da9a72901ea4b14e45410d87a3cf8e8fbc8f1 (patch) | |
tree | 9cbc6911eb69f8da7361eb78972c53efad4f7680 /include | |
parent | f97d54c8acd58144556ceeddba266b04ebcb808b (diff) |
Merged revisions 114052 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r114052 | mmichelson | 2008-04-10 17:02:32 -0500 (Thu, 10 Apr 2008) | 11 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@114056 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/lock.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 5d6ef43bb..36c25a87d 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -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) { |