[asterisk-commits] seanbright: branch group/bindings r173165 - in /team/group/bindings: ./ apps/...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Feb 3 09:54:36 CST 2009 

Author: seanbright
Date: Tue Feb  3 09:54:35 2009
New Revision: 173165

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=173165
Log:
Merged revisions 173104,173130 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r173104 | tilghman | 2009-02-02 19:24:52 -0500 (Mon, 02 Feb 2009) | 12 lines
  
  Merged revisions 173070 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r173070 | tilghman | 2009-02-02 18:15:59 -0600 (Mon, 02 Feb 2009) | 5 lines
    
    Add warning to standard config, that globals may be overridden by other
    dialplan configuration files.
    (closes issue #14388)
     Reported by: macli
  ........
................
  r173130 | tilghman | 2009-02-02 19:29:49 -0500 (Mon, 02 Feb 2009) | 2 lines
  
  Make OS X compile cleanly with app_stack
................

Modified:
    team/group/bindings/   (props changed)
    team/group/bindings/apps/app_stack.c
    team/group/bindings/configs/extensions.conf.sample
    team/group/bindings/configure
    team/group/bindings/configure.ac
    team/group/bindings/include/asterisk/autoconfig.h.in
    team/group/bindings/include/asterisk/compiler.h
    team/group/bindings/include/asterisk/optional_api.h
    team/group/bindings/main/xml.c

Propchange: team/group/bindings/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/bindings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb  3 09:54:35 2009
@@ -1,1 +1,1 @@
-/trunk:1-173076
+/trunk:1-173164

Modified: team/group/bindings/apps/app_stack.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/bindings/apps/app_stack.c?view=diff&rev=173165&r1=173164&r2=173165
==============================================================================
--- team/group/bindings/apps/app_stack.c (original)
+++ team/group/bindings/apps/app_stack.c Tue Feb  3 09:54:35 2009
@@ -640,7 +640,7 @@
 {
 	struct ast_context *con;
 
-	if (ast_agi_unregister(ast_module_info->self, &gosub_agi_command) == 1) {
+	if (ast_agi_unregister && ast_agi_unregister(ast_module_info->self, &gosub_agi_command) == 1) {
 		if ((con = ast_context_find("app_stack_gosub_virtual_context"))) {
 			ast_context_remove_extension2(con, "s", 1, NULL, 0);
 			ast_context_destroy(con, "app_stack"); /* leave nothing behind */
@@ -661,7 +661,7 @@
 {
 	struct ast_context *con;
 
-	if (ast_agi_register(ast_module_info->self, &gosub_agi_command) == 1) {
+	if (ast_agi_register && ast_agi_register(ast_module_info->self, &gosub_agi_command) == 1) {
 		if (!(con = ast_context_find_or_create(NULL, NULL, "app_stack_gosub_virtual_context", "app_stack"))) {
 			ast_log(LOG_ERROR, "Virtual context 'app_stack_gosub_virtual_context' does not exist and unable to create\n");
 			return AST_MODULE_LOAD_DECLINE;

Modified: team/group/bindings/configs/extensions.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/team/group/bindings/configs/extensions.conf.sample?view=diff&rev=173165&r1=173164&r2=173165
==============================================================================
--- team/group/bindings/configs/extensions.conf.sample (original)
+++ team/group/bindings/configs/extensions.conf.sample Tue Feb  3 09:54:35 2009
@@ -137,7 +137,13 @@
 ;
 TRUNKMSD=1					; MSD digits to strip (usually 1 or 0)
 ;TRUNK=IAX2/user:pass at provider
-
+;
+; WARNING WARNING WARNING WARNING
+; If you load any other extension configuration engine, such as pbx_ael.so,
+; your global variables may be overridden by that file.  Please take care to
+; use only one location to set global variables, and you will likely save
+; yourself a ton of grief.
+; WARNING WARNING WARNING WARNING
 ;
 ; Any category other than "General" and "Globals" represent 
 ; extension contexts, which are collections of extensions.  

Modified: team/group/bindings/configure.ac
URL: http://svn.digium.com/svn-view/asterisk/team/group/bindings/configure.ac?view=diff&rev=173165&r1=173164&r2=173165
==============================================================================
--- team/group/bindings/configure.ac (original)
+++ team/group/bindings/configure.ac Tue Feb  3 09:54:35 2009
@@ -490,6 +490,7 @@
 AST_GCC_ATTRIBUTE(sentinel)
 AST_GCC_ATTRIBUTE(warn_unused_result)
 AST_GCC_ATTRIBUTE(weak)
+AST_GCC_ATTRIBUTE(weak_import)
 AST_GCC_ATTRIBUTE(alias, [alias("foo")])
 
 AC_MSG_CHECKING(for -ffunction-sections support)

Modified: team/group/bindings/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/svn-view/asterisk/team/group/bindings/include/asterisk/autoconfig.h.in?view=diff&rev=173165&r1=173164&r2=173165
==============================================================================
--- team/group/bindings/include/asterisk/autoconfig.h.in (original)
+++ team/group/bindings/include/asterisk/autoconfig.h.in Tue Feb  3 09:54:35 2009
@@ -122,6 +122,9 @@
 
 /* Define to 1 if your GCC C compiler supports the 'weak' attribute. */
 #undef HAVE_ATTRIBUTE_weak
+
+/* Define to 1 if your GCC C compiler supports the 'weak_import' attribute. */
+#undef HAVE_ATTRIBUTE_weak_import
 
 /* Define this to indicate the ${BKTR_DESCRIP} library */
 #undef HAVE_BKTR

Modified: team/group/bindings/include/asterisk/compiler.h
URL: http://svn.digium.com/svn-view/asterisk/team/group/bindings/include/asterisk/compiler.h?view=diff&rev=173165&r1=173164&r2=173165
==============================================================================
--- team/group/bindings/include/asterisk/compiler.h (original)
+++ team/group/bindings/include/asterisk/compiler.h Tue Feb  3 09:54:35 2009
@@ -74,4 +74,10 @@
 #define attribute_weak
 #endif
 
+#ifdef HAVE_ATTRIBUTE_weak_import
+#define attribute_weak_import __attribute__((weak_import))
+#else
+#define attribute_weak_import
+#endif
+
 #endif /* _ASTERISK_COMPILER_H */

Modified: team/group/bindings/include/asterisk/optional_api.h
URL: http://svn.digium.com/svn-view/asterisk/team/group/bindings/include/asterisk/optional_api.h?view=diff&rev=173165&r1=173164&r2=173165
==============================================================================
--- team/group/bindings/include/asterisk/optional_api.h (original)
+++ team/group/bindings/include/asterisk/optional_api.h Tue Feb  3 09:54:35 2009
@@ -83,7 +83,10 @@
  */
 #define AST_OPTIONAL_API_UNAVAILABLE	INT_MIN
 
-#if defined(HAVE_ATTRIBUTE_weak) && defined(HAVE_ATTRIBUTE_alias) && !defined(AST_API_MODULE)
+#if defined(HAVE_ATTRIBUTE_weak_import) && !defined(AST_API_MODULE)
+#define AST_OPTIONAL_API(result, name, proto, stub)	result name proto __attribute__((weak_import));
+#define AST_OPTIONAL_API_ATTR(result, attr, name, proto, stub)	result name proto __attribute__((weak_import,attr));
+#elif defined(HAVE_ATTRIBUTE_weak) && defined(HAVE_ATTRIBUTE_alias) && !defined(AST_API_MODULE) && !defined(HAVE_ATTRIBUTE_weak_import)
 #define AST_OPTIONAL_API(result, name, proto, stub)	\
 	static result __##name proto stub;		\
 	result __attribute__((weak, alias("__" __stringify(name)))) name proto;

Modified: team/group/bindings/main/xml.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/bindings/main/xml.c?view=diff&rev=173165&r1=173164&r2=173165
==============================================================================
--- team/group/bindings/main/xml.c (original)
+++ team/group/bindings/main/xml.c Tue Feb  3 09:54:35 2009
@@ -27,6 +27,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #if defined(HAVE_LIBXML2)
+#define _POSIX_C_SOURCE	200112L
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 /* libxml2 ast_xml implementation. */

More information about the asterisk-commits mailing list