[asterisk-commits] file: trunk r375560 - in /trunk: ./ res/res_http_websocket.exports.in

[SVN commits to the Asterisk project]

Author: file
Date: Wed Oct 31 13:01:09 2012
New Revision: 375560

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=375560
Log:
Fix an issue with res_http_websocket where the chan_sip WebSocket handler could not be registered.

On some systems the optional API support uses the GCC compiler attribute "weakref" to provide its
functionality. This code changes the function names and prefixes "__" to the front. The
res_http_websocket exports file did not take this into account, thereby not allowing those functions
to be global and ultimately found.

(closes issue ASTERISK-20631)
Reported by: danjenkins
........

Merged revisions 375559 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/res/res_http_websocket.exports.in

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/res/res_http_websocket.exports.in
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_http_websocket.exports.in?view=diff&rev=375560&r1=375559&r2=375560
==============================================================================
--- trunk/res/res_http_websocket.exports.in (original)
+++ trunk/res/res_http_websocket.exports.in Wed Oct 31 13:01:09 2012
@@ -1,18 +1,18 @@
 {
 	global:
-		LINKER_SYMBOL_PREFIXast_websocket_add_protocol;
-		LINKER_SYMBOL_PREFIXast_websocket_remove_protocol;
-		LINKER_SYMBOL_PREFIXast_websocket_read;
-		LINKER_SYMBOL_PREFIXast_websocket_write;
-		LINKER_SYMBOL_PREFIXast_websocket_close;
-		LINKER_SYMBOL_PREFIXast_websocket_reconstruct_enable;
-		LINKER_SYMBOL_PREFIXast_websocket_reconstruct_disable;
-		LINKER_SYMBOL_PREFIXast_websocket_ref;
-		LINKER_SYMBOL_PREFIXast_websocket_unref;
-		LINKER_SYMBOL_PREFIXast_websocket_fd;
-		LINKER_SYMBOL_PREFIXast_websocket_remote_address;
-		LINKER_SYMBOL_PREFIXast_websocket_is_secure;
-		LINKER_SYMBOL_PREFIXast_websocket_set_nonblock;
+		LINKER_SYMBOL_PREFIX*ast_websocket_add_protocol;
+		LINKER_SYMBOL_PREFIX*ast_websocket_remove_protocol;
+		LINKER_SYMBOL_PREFIX*ast_websocket_read;
+		LINKER_SYMBOL_PREFIX*ast_websocket_write;
+		LINKER_SYMBOL_PREFIX*ast_websocket_close;
+		LINKER_SYMBOL_PREFIX*ast_websocket_reconstruct_enable;
+		LINKER_SYMBOL_PREFIX*ast_websocket_reconstruct_disable;
+		LINKER_SYMBOL_PREFIX*ast_websocket_ref;
+		LINKER_SYMBOL_PREFIX*ast_websocket_unref;
+		LINKER_SYMBOL_PREFIX*ast_websocket_fd;
+		LINKER_SYMBOL_PREFIX*ast_websocket_remote_address;
+		LINKER_SYMBOL_PREFIX*ast_websocket_is_secure;
+		LINKER_SYMBOL_PREFIX*ast_websocket_set_nonblock;
 	local:
 		*;
 };