[asterisk-commits] tilghman: trunk r83545 - in /trunk/utils: Makefile clicompat.c hashtest2.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sat Sep 22 09:45:42 2007
New Revision: 83545

URL: http://svn.digium.com/view/asterisk?view=rev&rev=83545
Log:
Fix build of check_expr and hashtest2 when DEBUG_THREADLOCAL is defined

Added:
    trunk/utils/clicompat.c   (with props)
Modified:
    trunk/utils/Makefile
    trunk/utils/hashtest2.c

Modified: trunk/utils/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/utils/Makefile?view=diff&rev=83545&r1=83544&r2=83545
==============================================================================
--- trunk/utils/Makefile (original)
+++ trunk/utils/Makefile Sat Sep 22 09:45:42 2007
@@ -94,7 +94,7 @@
 
 pval.o : ASTCFLAGS+=-DSTANDALONE
 
-check_expr: check_expr.o ast_expr2.o ast_expr2f.o strcompat.o
+check_expr: check_expr.o ast_expr2.o ast_expr2f.o strcompat.o clicompat.o ../main/threadstorage.o
 
 aelbison.c: ../res/ael/ael.tab.c
 	@cp $< $@
@@ -131,8 +131,8 @@
 hashtest2.o : hashtest2.c
 	$(CC) -g -O0 -c hashtest2.c $(PTHREAD_CFLAGS) -I/usr/include -I../include
 
-hashtest2 : hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o
-	$(CC) -g -O0 -o hashtest2 hashtest2.o astobj2.o utils.o md5.o sha1.o strcompat.o $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBS)
+hashtest2 : hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o ../main/threadstorage.o clicompat.o
+	$(CC) -g -O0 -o hashtest2 hashtest2.o astobj2.o utils.o md5.o sha1.o strcompat.o ../main/threadstorage.o clicompat.o $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBS)
 
 extconf.o : extconf.c
 

Added: trunk/utils/clicompat.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/clicompat.c?view=auto&rev=83545
==============================================================================
--- trunk/utils/clicompat.c (added)
+++ trunk/utils/clicompat.c Sat Sep 22 09:45:42 2007
@@ -1,0 +1,12 @@
+void ast_cli(void);
+void ast_cli(void)
+{
+	return;
+}
+
+int ast_cli_register_multiple(void);
+int ast_cli_register_multiple(void)
+{
+	return 0;
+}
+

Propchange: trunk/utils/clicompat.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/utils/clicompat.c
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: trunk/utils/clicompat.c
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: trunk/utils/hashtest2.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/hashtest2.c?view=diff&rev=83545&r1=83544&r2=83545
==============================================================================
--- trunk/utils/hashtest2.c (original)
+++ trunk/utils/hashtest2.c Sat Sep 22 09:45:42 2007
@@ -54,10 +54,6 @@
 int testno = 2;
 
 /* stuff we need to make this work with the astobj2 stuff */
-
-void ast_cli(int *fd, char *str, ...)
-{
-}
 
 int64_t ast_mark(int prof_id, int x)
 {
@@ -350,10 +346,6 @@
 }
 
 
-void ast_cli_register_multiple(void)
-{
-}
-
 void ast_register_file_version(const char *file, const char *version)
 {
 }