aboutsummaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-09-22 14:45:42 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-09-22 14:45:42 +0000
commit480f725cc1382cd409a34843f4e4d304cf4d365c (patch)
tree04286d938658c2df616148e37682cb6a74be3133 /utils
parent9a467a1d9da15b46c77b2da13165afa2e88e1a99 (diff)
Fix build of check_expr and hashtest2 when DEBUG_THREADLOCAL is defined
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@83545 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile6
-rw-r--r--utils/clicompat.c12
-rw-r--r--utils/hashtest2.c8
3 files changed, 15 insertions, 11 deletions
diff --git a/utils/Makefile b/utils/Makefile
index 533912bf1..1beaf8642 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -94,7 +94,7 @@ ast_expr2f.o: ASTCFLAGS+=-DSTANDALONE_AEL -I../main
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 @@ astobj2.o : astobj2.c
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
diff --git a/utils/clicompat.c b/utils/clicompat.c
new file mode 100644
index 000000000..75e31365e
--- /dev/null
+++ b/utils/clicompat.c
@@ -0,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;
+}
+
diff --git a/utils/hashtest2.c b/utils/hashtest2.c
index 2e3bc410d..29c8123d4 100644
--- a/utils/hashtest2.c
+++ b/utils/hashtest2.c
@@ -55,10 +55,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_module_unregister(const struct ast_module_info *x)
}
-void ast_cli_register_multiple(void)
-{
-}
-
void ast_register_file_version(const char *file, const char *version)
{
}