1
0
mirror of https://github.com/anope/anope.git synced 2026-06-27 06:26:37 +02:00

Merge commit 'trunk' into anopeng (1.8 updates, etc)

Conflicts:

	src/main.c
	src/mysql.c
	version.log


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1504 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Robin Burchell w00t@inspircd.org
2008-11-03 00:01:19 +00:00
parent a765a1155f
commit eda1fca43e
24 changed files with 7722 additions and 6691 deletions
+2
View File
@@ -495,6 +495,7 @@ E void helpserv(User * u, char *buf);
E void helpserv_init(void);
/**** hostserv.c ****/
E void get_hostserv_stats(long *nrec, long *memuse);
E void hostserv_init(void);
E void addHostCore(char *nick, char *vIdent, char *vhost, const char *creator, int32 tmp_time);
E char *getvIdent(char *nick);
@@ -991,6 +992,7 @@ E int db_mysql_open();
E int db_mysql_close();
E int db_mysql_query(char *sql);
E char *db_mysql_quote(char *sql);
E char *db_mysql_quote_buffer(char *sql, int size);
E int db_mysql_try(const char *fmt, ...);
E int db_mysql_save_ns_core(NickCore * nc);
E int db_mysql_save_ns_alias(NickAlias * na);