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

7 files changed, 30 insertions, 7 deletions

diff --git a/utils/Makefile b/utils/Makefile
index 444e574ec..99db911e0 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -80,7 +80,7 @@ clean:
 
 md5.c: $(ASTTOPDIR)/main/md5.c
 	@cp $< $@
-
+astman.o: astman.i
 astman: astman.o md5.o
 astman: LIBS+=$(NEWT_LIB)
 
diff --git a/utils/ael_main.c b/utils/ael_main.c
index 7f20365f3..66d43175c 100644
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -165,14 +165,17 @@ struct ast_custom_function *ast_custom_function_find(const char *name)
 	return 0; /* in "standalone" mode, functions are just not avail */
 }
 
+void ast_register_file_version(const char *file, const char *version);
 void ast_register_file_version(const char *file, const char *version)
 {
 }
 
+void ast_unregister_file_version(const char *file);
 void ast_unregister_file_version(const char *file)
 {
 }
 
+#if !defined(LOW_MEMORY)
 int ast_add_profile(const char *x, uint64_t scale)
 {
 	if (!no_comp)
@@ -180,6 +183,7 @@ int ast_add_profile(const char *x, uint64_t scale)
 
 	return 0;
 }
+#endif
 
 int ast_loader_register(int (*updater)(void))
 {
@@ -582,3 +586,4 @@ int main(int argc, char **argv)
 	
     return 0;
 }
+
diff --git a/utils/astman.c b/utils/astman.c
index 2a4508589..f674105a5 100644
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -92,6 +92,7 @@ void ast_unregister_file_version(const char *file)
 {
 }
 
+#if !defined(LOW_MEMORY)
 int ast_add_profile(const char *, uint64_t scale);
 int ast_add_profile(const char *s, uint64_t scale)
 {
@@ -108,6 +109,7 @@ int64_t ast_mark(int key, int start1_stop0)
 {
 	return 0;
 }
+#endif /* LOW_MEMORY */
 
 /* end of dummy functions */
 
diff --git a/utils/check_expr.c b/utils/check_expr.c
index 260fd4e2e..7b013f163 100644
--- a/utils/check_expr.c
+++ b/utils/check_expr.c
@@ -85,6 +85,7 @@ enum ast_lock_type {
 	        AST_WRLOCK,
 };
 #endif
+#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);
 void ast_store_lock_info(enum ast_lock_type type, const char *filename,
@@ -104,6 +105,7 @@ void ast_remove_lock_info(void *lock_addr)
 {
     /* not a lot to do in a standalone w/o threading! */
 }
+#endif
 
 static int global_lineno = 1;
 static int global_expr_count=0;
@@ -145,9 +147,11 @@ unsigned int check_expr(char* buffer, char* error_report);
 int check_eval(char *buffer, char *error_report);
 void parse_file(const char *fname);
 
+void ast_register_file_version(const char *file, const char *version);  
 void ast_register_file_version(const char *file, const char *version) { }
+#if !defined(LOW_MEMORY)
 int ast_add_profile(const char *x, uint64_t scale) { return 0;} 
-
+#endif
 int ast_atomic_fetchadd_int_slow(volatile int *p, int v)
 {
         int ret;
@@ -156,6 +160,7 @@ int ast_atomic_fetchadd_int_slow(volatile int *p, int v)
         return ret;
 }
 
+void ast_unregister_file_version(const char *file);
 void ast_unregister_file_version(const char *file)
 {
 }
diff --git a/utils/conf2ael.c b/utils/conf2ael.c
index fa6a3ccdb..02d28af0d 100644
--- a/utils/conf2ael.c
+++ b/utils/conf2ael.c
@@ -76,15 +76,18 @@ char ast_config_AST_SYSTEM_NAME[20] = ""; */
 /* static AST_RWLIST_HEAD_STATIC(acf_root, ast_custom_function); */
 //extern char ast_config_AST_CONFIG_DIR[PATH_MAX];
 
+void ast_register_file_version(const char *file, const char *version);
 void ast_register_file_version(const char *file, const char *version)
 {
 }
 
+void ast_unregister_file_version(const char *file);
 void ast_unregister_file_version(const char *file)
 {
 }
+#if !defined(LOW_MEMORY)
 int ast_add_profile(const char *x, uint64_t scale) { return 0;}
-
+#endif
 /* Our own version of ast_log, since the expr parser uses it. -- stolen from utils/check_expr.c */
 void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__ ((format (printf,5,6)));
 
diff --git a/utils/hashtest.c b/utils/hashtest.c
index e1780791f..bce9d8c2e 100644
--- a/utils/hashtest.c
+++ b/utils/hashtest.c
@@ -43,11 +43,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 int testno = 1;
 
 /* stuff we need to make this work with the hashtab stuff */
-
+#if !defined(LOW_MEMORY)
 int64_t ast_mark(int prof_id, int x)
 {
 	return 0;
 }
+#endif
 
 struct ht_element 
 {
@@ -299,11 +300,12 @@ int main(int argc,char **argv)
 	
 	return 0;
 }
-
+#if !defined(LOW_MEMORY)
 int  ast_add_profile(const char *x, uint64_t scale)
 {
 	return 0;
 }
+#endif
 
 int ast_loader_register(int (*updater)(void))
 {
@@ -323,10 +325,12 @@ void ast_module_unregister(const struct ast_module_info *x)
 }
 
 
+void ast_register_file_version(const char *file, const char *version);
 void ast_register_file_version(const char *file, const char *version)
 {
 }
 
+void ast_unregister_file_version(const char *file);
 void ast_unregister_file_version(const char *file)
 {
 
diff --git a/utils/hashtest2.c b/utils/hashtest2.c
index 0fe10ab75..aa81719b6 100644
--- a/utils/hashtest2.c
+++ b/utils/hashtest2.c
@@ -45,11 +45,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 int testno = 2;
 
 /* stuff we need to make this work with the astobj2 stuff */
-
+#if !defined(LOW_MEMORY)
 int64_t ast_mark(int prof_id, int x)
 {
 	return 0;
 }
+#endif
 
 /* my OBJECT */
 struct ht_element 
@@ -311,11 +312,12 @@ int main(int argc,char **argv)
 	return 0;
 }
 
-
+#if !defined(LOW_MEMORY)
 int ast_add_profile(const char *x, uint64_t scale)
 {
 	return 0;
 }
+#endif
 
 int ast_loader_register(int (*updater)(void))
 {
@@ -335,10 +337,12 @@ void ast_module_unregister(const struct ast_module_info *x)
 }
 
 
+void ast_register_file_version(const char *file, const char *version);
 void ast_register_file_version(const char *file, const char *version)
 {
 }
 
+void ast_unregister_file_version(const char *file);
 void ast_unregister_file_version(const char *file)
 {