diff options
| author | Naram Qashat cyberbotx@cyberbotx.com <Naram Qashat cyberbotx@cyberbotx.com@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-10-15 02:57:50 +0000 |
|---|---|---|
| committer | Naram Qashat cyberbotx@cyberbotx.com <Naram Qashat cyberbotx@cyberbotx.com@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-10-15 02:57:50 +0000 |
| commit | eef1d4d691e8b7c4c80763dcd1e0c97b11350be0 (patch) | |
| tree | c23b2417b1b7402563abf410f4cbdbedf49d1425 /src/tools | |
| parent | 29a074878d72f789f9a7eacb6b17e2e97b33fdd0 (diff) | |
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
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/db-merger.c | 3 |
1 files changed, 1 insertions, 2 deletions
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) */ |