[svn-commits] russell: trunk r84147 - in /trunk: ./ include/asterisk/module.h

[SVN commits to the Digium repositories]

Author: russell
Date: Sun Sep 30 15:06:58 2007
New Revision: 84147

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84147
Log:
Merged revisions 84146 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r84146 | russell | 2007-09-30 16:02:16 -0400 (Sun, 30 Sep 2007) | 4 lines

Fix the AST_MODULE_INFO macro for C++ modules.  The load and reload parameters
were in the wrong place.
(closes issue #10846, alebm)

........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/module.h

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

Modified: trunk/include/asterisk/module.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/module.h?view=diff&rev=84147&r1=84146&r2=84147
==============================================================================
--- trunk/include/asterisk/module.h (original)
+++ trunk/include/asterisk/module.h Sun Sep 30 15:06:58 2007
@@ -237,8 +237,8 @@
 	static struct ast_module_info __mod_info = {	\
 		NULL,					\
 		load_func,				\
+		reload_func,				\
 		unload_func,				\
-		reload_func,				\
 		AST_MODULE,				\
 		desc,					\
 		keystr,					\