diff options
| author | Robin Burchell w00t@inspircd.org <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-09-30 18:45:08 +0000 |
|---|---|---|
| committer | Robin Burchell w00t@inspircd.org <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-09-30 18:45:08 +0000 |
| commit | 12ef623e94b5b1e668739c083eab3e045cf0b3f3 (patch) | |
| tree | eec11262ea3e3b44e10258adbfae28d77f3e6339 /src | |
| parent | 115136b09e4e367cd475bffa35deb49a2deb242e (diff) | |
Partial fixes for g++, need to commit this
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1175 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
| -rw-r--r-- | src/language.c | 4 | ||||
| -rw-r--r-- | src/mail.c | 6 | ||||
| -rw-r--r-- | src/main.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/language.c b/src/language.c index 1c29b1ec9..d521cf188 100644 --- a/src/language.c +++ b/src/language.c @@ -88,7 +88,7 @@ static void load_lang(int index, const char *filename) alog("Warning: Bad number of strings (%d, wanted %d) " "for language %d (%s)", num, NUM_STRINGS, index, filename); } - langtexts[index] = scalloc(sizeof(char *), NUM_STRINGS); + langtexts[index] = (char **)scalloc(sizeof(char *), NUM_STRINGS); if (num > NUM_STRINGS) num = NUM_STRINGS; for (i = 0; i < num; i++) { @@ -128,7 +128,7 @@ static void load_lang(int index, const char *filename) langtexts[index] = NULL; return; } else { - langtexts[index][i] = scalloc(len + 1, 1); + langtexts[index][i] = (char *)scalloc(len + 1, 1); fseek(f, pos, SEEK_SET); if (fread(langtexts[index][i], 1, len, f) != len) { alog("Failed to read string %d in language %d (%s)", diff --git a/src/mail.c b/src/mail.c index 04b54cf49..408243cc4 100644 --- a/src/mail.c +++ b/src/mail.c @@ -44,7 +44,7 @@ MailInfo *MailRegBegin(User * u, NickRequest * nr, char *subject, } else { MailInfo *mail; - mail = scalloc(sizeof(MailInfo), 1); + mail = (MailInfo *)scalloc(sizeof(MailInfo), 1); mail->sender = u; mail->recipient = NULL; mail->recip = nr; @@ -97,7 +97,7 @@ MailInfo *MailBegin(User * u, NickCore * nc, char *subject, char *service) } else { MailInfo *mail; - mail = scalloc(sizeof(MailInfo), 1); + mail = (MailInfo *)scalloc(sizeof(MailInfo), 1); mail->sender = u; mail->recipient = nc; mail->recip = NULL; @@ -142,7 +142,7 @@ MailInfo *MailMemoBegin(NickCore * nc) } else { MailInfo *mail; - mail = scalloc(sizeof(MailInfo), 1); + mail = (MailInfo *)scalloc(sizeof(MailInfo), 1); mail->sender = NULL; mail->recipient = nc; mail->recip = NULL; diff --git a/src/main.c b/src/main.c index c848e6494..e2927b283 100644 --- a/src/main.c +++ b/src/main.c @@ -61,7 +61,7 @@ int quitting = 0; int delayed_quit = 0; /* Contains a message as to why services is terminating */ -char *quitmsg = NULL; +const char *quitmsg = NULL; /* Input buffer - global, so we can dump it if something goes wrong */ char inbuf[BUFSIZE]; |