Index: app_addon_sql_mysql.c
===================================================================
--- app_addon_sql_mysql.c	(revision 220)
+++ app_addon_sql_mysql.c	(working copy)
@@ -43,7 +43,7 @@
 "MYSQL():  Do several mySQLy things\n"
 "Syntax:\n"
 "  MYSQL(Connect connid dhhost dbuser dbpass dbname)\n"
-"    Connects to a database.  Arguments contain standard MySQL parameters\n"
+"    Connects to a database. Arguments contain standard MySQL parameters\n"
 "    passed to function mysql_real_connect.  Connection identifer returned\n"
 "    in ${var}\n"
 "  MYSQL(Query resultid ${connid} query-string)\n"
@@ -414,32 +414,27 @@
 	return 0;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	STANDARD_HANGUP_LOCALUSERS;
 	return ast_unregister_application(app);
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	struct MYSQLidshead *headp = &_mysql_ids_head;
 	AST_LIST_HEAD_INIT(headp);
 	return ast_register_application(app, MYSQL_exec, synopsis, descrip);
 }
 
-char *description(void)
+static const char *description(void)
 {
 	return tdesc;
 }
 
-int usecount(void)
+static const char *key(void)
 {
-	int res;
-	STANDARD_USECOUNT(res);
-	return res;
-}
-
-char *key()
-{
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD1;
Index: Makefile
===================================================================
--- Makefile	(revision 220)
+++ Makefile	(working copy)
@@ -20,11 +20,13 @@
 #Overwite config files on "make samples"
 OVERWRITE=y
 
-MODS=format_mp3/format_mp3.so app_saycountpl.so
+# Don't make these until trunk is fixed
+# MODS=format_mp3/format_mp3.so app_saycountpl.so
 
 CFLAGS+=-fPIC
 CFLAGS+=-I../asterisk
 CFLAGS+=-D_GNU_SOURCE
+CFLAGS+=-DHAVE_STRTOQ
 
 INSTALL=install
 INSTALL_PREFIX=