From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 10 Apr 2008 20:59:49 +0000 (+0000)
Subject: Fix 1.4 build when LOW_MEMORY is enabled.
X-Git-Tag: 1.4.20-rc1~71
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a9b7dc5c5514797993339ae1ae634147ef80c12;p=thirdparty%2Fasterisk.git

Fix 1.4 build when LOW_MEMORY is enabled.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@114051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index 8a3ed1d5f4..cc68a13aa3 100644
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -141,18 +141,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
@@ -160,7 +173,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)
 {
diff --git a/main/utils.c b/main/utils.c
index 5b80b107cb..6d20a9d902 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -1354,7 +1354,9 @@ int ast_utils_init(void)
 {
 	base64_init();
 #ifdef DEBUG_THREADS
+#if !defined(LOW_MEMORY)
 	ast_cli_register_multiple(utils_cli, sizeof(utils_cli) / sizeof(utils_cli[0]));
+#endif
 #endif
 	return 0;
 }