[asterisk-commits] dlee: branch dlee/performance r399526 - in /team/dlee/performance: ./ main/

[SVN commits to the Asterisk project]

Author: dlee
Date: Fri Sep 20 10:31:53 2013
New Revision: 399526

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399526
Log:
Removed some extraneous changes

Modified:
    team/dlee/performance/Makefile
    team/dlee/performance/main/Makefile
    team/dlee/performance/main/stasis_channels.c

Modified: team/dlee/performance/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/dlee/performance/Makefile?view=diff&rev=399526&r1=399525&r2=399526
==============================================================================
--- team/dlee/performance/Makefile (original)
+++ team/dlee/performance/Makefile Fri Sep 20 10:31:53 2013
@@ -253,6 +253,7 @@
 ifneq ($(findstring darwin,$(OSARCH)),)
   _ASTCFLAGS+=-D__Darwin__ -mmacosx-version-min=10.6
   _SOLINK=-mmacosx-version-min=10.6 -Xlinker -undefined -Xlinker dynamic_lookup
+  _SOLINK+=/usr/lib/bundle1.o
   SOLINK=-bundle $(_SOLINK)
   DYLINK=-Xlinker -dylib $(_SOLINK)
   _ASTLDFLAGS+=-L/usr/local/lib

Modified: team/dlee/performance/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/dlee/performance/main/Makefile?view=diff&rev=399526&r1=399525&r2=399526
==============================================================================
--- team/dlee/performance/main/Makefile (original)
+++ team/dlee/performance/main/Makefile Fri Sep 20 10:31:53 2013
@@ -60,6 +60,7 @@
 ifneq ($(findstring darwin,$(OSARCH)),)
   AST_LIBS+=-lresolv
   ASTLINK=-mmacosx-version-min=10.6 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
+  ASTLINK+=/usr/lib/bundle1.o
 else
 # These are used for all but Darwin
   ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)

Modified: team/dlee/performance/main/stasis_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/performance/main/stasis_channels.c?view=diff&rev=399526&r1=399525&r2=399526
==============================================================================
--- team/dlee/performance/main/stasis_channels.c (original)
+++ team/dlee/performance/main/stasis_channels.c Fri Sep 20 10:31:53 2013
@@ -174,9 +174,7 @@
 {
 	RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup);
 	RAII_VAR(struct ast_bridge *, bridge, NULL, ao2_cleanup);
-#if 0
 	char nativeformats[256];
-#endif
 	struct ast_str *write_transpath = ast_str_alloca(256);
 	struct ast_str *read_transpath = ast_str_alloca(256);
 	struct ast_party_id effective_connected_id;
@@ -238,10 +236,8 @@
 		ast_string_field_set(snapshot, bridgeid, bridge->uniqueid);
 	}
 
-#if 0
 	ast_string_field_set(snapshot, nativeformats, ast_getformatname_multiple(nativeformats, sizeof(nativeformats),
-			ast_channel_nativeformats(chan)));
-#endif
+		ast_channel_nativeformats(chan)));
 	ast_string_field_set(snapshot, readformat, ast_getformatname(ast_channel_readformat(chan)));
 	ast_string_field_set(snapshot, writeformat, ast_getformatname(ast_channel_writeformat(chan)));
 	ast_string_field_set(snapshot, writetrans, ast_translate_path_to_str(ast_channel_writetrans(chan), &write_transpath));