[asterisk-commits] dlee: branch 10-digiumphones r376311 - in /branches/10-digiumphones: ./ inclu...

[SVN commits to the Asterisk project]

Author: dlee
Date: Thu Nov 15 17:06:56 2012
New Revision: 376311

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=376311
Log:
Reverted r376309; merged to wrong branch

Added:
    branches/10-digiumphones/utils/hashtest.c
      - copied unchanged from r376308, branches/10-digiumphones/utils/hashtest.c
    branches/10-digiumphones/utils/hashtest2.c
      - copied unchanged from r376308, branches/10-digiumphones/utils/hashtest2.c
Removed:
    branches/10-digiumphones/tests/test_astobj2_thrash.c
    branches/10-digiumphones/tests/test_hashtab_thrash.c
Modified:
    branches/10-digiumphones/   (props changed)
    branches/10-digiumphones/include/asterisk/hashtab.h
    branches/10-digiumphones/utils/Makefile
    branches/10-digiumphones/utils/utils.xml

Propchange: branches/10-digiumphones/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10-digiumphones/include/asterisk/hashtab.h
URL: http://svnview.digium.com/svn/asterisk/branches/10-digiumphones/include/asterisk/hashtab.h?view=diff&rev=376311&r1=376310&r2=376311
==============================================================================
--- branches/10-digiumphones/include/asterisk/hashtab.h (original)
+++ branches/10-digiumphones/include/asterisk/hashtab.h Thu Nov 15 17:06:56 2012
@@ -23,9 +23,6 @@
  * \brief Generic (perhaps overly so) hashtable implementation
  * \ref AstHash
  */
-
-#include "asterisk/lock.h"
-
 /*! \page AstHash Hash Table support in Asterisk
 
 A hash table is a structure that allows for an exact-match search

Modified: branches/10-digiumphones/utils/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/10-digiumphones/utils/Makefile?view=diff&rev=376311&r1=376310&r2=376311
==============================================================================
--- branches/10-digiumphones/utils/Makefile (original)
+++ branches/10-digiumphones/utils/Makefile Thu Nov 15 17:06:56 2012
@@ -88,7 +88,7 @@
 	rm -f *.s *.i
 	rm -f md5.c strcompat.c ast_expr2.c ast_expr2.h ast_expr2f.c pbx_ael.c pval.c hashtab.c lock.c
 	rm -f aelparse.c aelbison.c conf2ael
-	rm -f utils.c strings.c threadstorage.c sha1.c astobj2.c refcounter
+	rm -f utils.c strings.c threadstorage.c sha1.c astobj2.c hashtest2 hashtest refcounter
 	rm -f db1-ast/.*.d
 	@$(MAKE) -C db1-ast clean
 
@@ -175,6 +175,11 @@
 	$(ECHO_PREFIX) echo "   [CP] $(subst $(ASTTOPDIR)/,,$<) -> $@"
 	$(CMD_PREFIX) cp "$<" "$@"
 
+hashtest2.o: _ASTCFLAGS+=-O0
+hashtest2: hashtest2.o md5.o lock.o utils.o strings.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o
+
+hashtest: hashtest.o md5.o hashtab.o lock.o utils.o strings.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o
+hashtest.o: _ASTCFLAGS+=-O0
 
 refcounter: refcounter.o md5.o hashtab.o lock.o utils.o strings.o sha1.o strcompat.o threadstorage.o clicompat.o poll.o
 refcounter.o: _ASTCFLAGS+=-O0

Modified: branches/10-digiumphones/utils/utils.xml
URL: http://svnview.digium.com/svn/asterisk/branches/10-digiumphones/utils/utils.xml?view=diff&rev=376311&r1=376310&r2=376311
==============================================================================
--- branches/10-digiumphones/utils/utils.xml (original)
+++ branches/10-digiumphones/utils/utils.xml Thu Nov 15 17:06:56 2012
@@ -32,6 +32,14 @@
 	<defaultenabled>no</defaultenabled>
 	<support_level>extended</support_level>
   </member>
+  <member name="hashtest">
+	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
+  </member>
+  <member name="hashtest2">
+	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
+  </member>
   <member name="muted">
 	<defaultenabled>no</defaultenabled>
 	<support_level>extended</support_level>