From eef1d4d691e8b7c4c80763dcd1e0c97b11350be0 Mon Sep 17 00:00:00 2001 From: "Naram Qashat cyberbotx@cyberbotx.com" Date: Wed, 15 Oct 2008 02:57:50 +0000 Subject: Merge branch 'anopeng-config' of http://git.inspircd.org/git/anope/ into anopeng-config git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1449 5417fbe8-f217-4b02-8779-1006273d7864 --- src/tools/db-merger.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/tools') diff --git a/src/tools/db-merger.c b/src/tools/db-merger.c index dd835cbe4..a80508af5 100644 --- a/src/tools/db-merger.c +++ b/src/tools/db-merger.c @@ -209,7 +209,6 @@ struct nickcore_ { char **access; /* Array of strings */ MemoInfo memos; /* Memo information */ uint16 channelcount; /* Number of channels currently registered */ - uint16 channelmax; /* Maximum number of channels allowed */ int unused; /* Used for nick collisions */ int aliascount; /* How many aliases link to us? Remove the core if 0 */ }; @@ -675,7 +674,7 @@ int main(int argc, char *argv[]) SAFE(write_string(memos->text, f)); } SAFE(write_int16(nc->channelcount, f)); - SAFE(write_int16(nc->channelmax, f)); + SAFE(write_int16(nc->channelcount, f)); // BK with anope1.7, hack alert XXX } /* for (nc) */ SAFE(write_int8(0, f)); } /* for (i) */ -- cgit