[asterisk-commits] rmudgett: trunk r399198 - in /trunk: ./ apps/ res/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Sep 16 13:00:32 2013
New Revision: 399198

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399198
Log:
app_speech_utils: Fix unresolved symbol ast_speech_get_setting().

Fixes regression introduced by -r374096.

* Made res_speech.export.in export ast_* symbols instead of specific
functions.

* Made app_speech_utils.c declare that it is dependent upon res_speech.

(issue ASTERISK-17136)
Reported by: Richard Kenner
........

Merged revisions 399197 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/apps/app_speech_utils.c
    trunk/res/res_speech.exports.in

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Mon Sep 16 13:00:32 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399100,399136,399146,399160
+/branches/12:1-398558,398560-398577,398579-399100,399136,399146,399160,399197

Modified: trunk/apps/app_speech_utils.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_speech_utils.c?view=diff&rev=399198&r1=399197&r2=399198
==============================================================================
--- trunk/apps/app_speech_utils.c (original)
+++ trunk/apps/app_speech_utils.c Mon Sep 16 13:00:32 2013
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<support_level>core</support_level>
+	<depend>res_speech</depend>
  ***/
 
 #include "asterisk.h"

Modified: trunk/res/res_speech.exports.in
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_speech.exports.in?view=diff&rev=399198&r1=399197&r2=399198
==============================================================================
--- trunk/res/res_speech.exports.in (original)
+++ trunk/res/res_speech.exports.in Mon Sep 16 13:00:32 2013
@@ -1,21 +1,6 @@
 {
 	global:
-		LINKER_SYMBOL_PREFIXast_speech_change;
-		LINKER_SYMBOL_PREFIXast_speech_change_results_type;
-		LINKER_SYMBOL_PREFIXast_speech_change_state;
-		LINKER_SYMBOL_PREFIXast_speech_destroy;
-		LINKER_SYMBOL_PREFIXast_speech_dtmf;
-		LINKER_SYMBOL_PREFIXast_speech_grammar_activate;
-		LINKER_SYMBOL_PREFIXast_speech_grammar_deactivate;
-		LINKER_SYMBOL_PREFIXast_speech_grammar_load;
-		LINKER_SYMBOL_PREFIXast_speech_grammar_unload;
-		LINKER_SYMBOL_PREFIXast_speech_new;
-		LINKER_SYMBOL_PREFIXast_speech_register;
-		LINKER_SYMBOL_PREFIXast_speech_results_free;
-		LINKER_SYMBOL_PREFIXast_speech_results_get;
-		LINKER_SYMBOL_PREFIXast_speech_start;
-		LINKER_SYMBOL_PREFIXast_speech_unregister;
-		LINKER_SYMBOL_PREFIXast_speech_write;
+		LINKER_SYMBOL_PREFIXast_*;
 	local:
 		*;
 };