From: Russell Bryant <russell@russellbryant.com>
Date: Sun, 30 Sep 2007 20:06:58 +0000 (+0000)
Subject: Merged revisions 84146 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1300
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=019c07e63effadf5002813f5a18d95f9fd159e58;p=thirdparty%2Fasterisk.git

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)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/module.h b/include/asterisk/module.h
index d53e6086ce..4c6cc507b2 100644
--- a/include/asterisk/module.h
+++ b/include/asterisk/module.h
@@ -237,8 +237,8 @@ void ast_module_unref(struct ast_module *);
 	static struct ast_module_info __mod_info = {	\
 		NULL,					\
 		load_func,				\
-		unload_func,				\
 		reload_func,				\
+		unload_func,				\
 		AST_MODULE,				\
 		desc,					\
 		keystr,					\