[asterisk-commits] trunk r36524 - in /trunk/res: Makefile res_snmp.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sat Jul  1 10:13:56 2006
New Revision: 36524

URL: http://svn.digium.com/view/asterisk?rev=36524&view=rev
Log:
fix up res_snmp so it builds and loads correctly
- update to current loader
- update to latest build system changes to ensure snmp/agent.o is built
  and linked

Modified:
    trunk/res/Makefile
    trunk/res/res_snmp.c

Modified: trunk/res/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/res/Makefile?rev=36524&r1=36523&r2=36524&view=diff
==============================================================================
--- trunk/res/Makefile (original)
+++ trunk/res/Makefile Sat Jul  1 10:13:56 2006
@@ -24,6 +24,8 @@
 
 include ../Makefile.rules
 
+res_snmp.so: res_snmp.o snmp/agent.o
+
 clean::
 	rm -f snmp/*.o
 

Modified: trunk/res/res_snmp.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_snmp.c?rev=36524&r1=36523&r2=36524&view=diff
==============================================================================
--- trunk/res/res_snmp.c (original)
+++ trunk/res/res_snmp.c Sat Jul  1 10:13:56 2006
@@ -89,7 +89,7 @@
     return 0;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
     load_config();
 
@@ -102,7 +102,7 @@
 		return 0;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
     ast_verbose(VERBOSE_PREFIX_1 "Unloading [Sub]Agent Module\n");
 
@@ -110,7 +110,7 @@
     return pthread_join(thread, NULL);
 }
 
-int reload(void)
+static int reload(void *mod)
 {
     ast_verbose(VERBOSE_PREFIX_1 "Reloading [Sub]Agent Module\n");
 
@@ -127,17 +127,14 @@
 		return 0;
 }
 
-int usecount(void)
-{
-    return 0;
-}
-
-const char *key(void)
+static const char *key(void)
 {
     return ASTERISK_GPL_KEY;
 }
 
-const char *description(void)
+static const char *description(void)
 {
     return MODULE_DESCRIPTION;
 }
+
+STD_MOD(MOD_0, reload, NULL, NULL);