summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@Anope.org>2010-09-08 16:23:16 -0400
committerAdam <Adam@Anope.org>2010-09-08 16:23:16 -0400
commitf4a0ee30b30bf3ff8c5039f54aa04593fa58b0e3 (patch)
tree1f327c4865bee2cbecd41bab3c2aec78f78ab232
parentbd94cbc25b27250872ba4e682cf7af36e16a2d25 (diff)
Fixed Windows build
-rw-r--r--src/mail.c2
-rw-r--r--src/protocol/inspircd20.c18
-rw-r--r--src/protocol/inspircd20.h14
-rw-r--r--version.log2
4 files changed, 18 insertions, 18 deletions
diff --git a/src/mail.c b/src/mail.c
index 1e3109edd..590518e69 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -188,7 +188,7 @@ void MailEnd(MailInfo * mail)
return;
}
-#ifdef HAVE_FORK
+#if HAVE_FORK
if (ForkForMail && !(pid = fork()))
{
pclose(mail->pipe);
diff --git a/src/protocol/inspircd20.c b/src/protocol/inspircd20.c
index 330fc99fc..9efbdd3e2 100644
--- a/src/protocol/inspircd20.c
+++ b/src/protocol/inspircd20.c
@@ -48,7 +48,21 @@ static int16 get_new_statusmode()
if (last_mode == CUS_DEOPPED)
last_mode = last_mode << 1; // get around CUS_DEOPPED
return last_mode;
-};
+}
+
+uint32 get_mode_from_char(const char c)
+{
+ struct chmodeinfo *p = chmodes;
+
+ while (p->modechar != 0)
+ {
+ if (p->modechar == c)
+ return p->mode;
+ ++p;
+ }
+
+ return 0;
+}
static char flood_mode_set[3];
static char flood_mode_unset[3];
@@ -233,7 +247,7 @@ char myCsmodes[128] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
-static inline char sym_from_char(const char c)
+static char sym_from_char(const char c)
{
int i;
for (i = 0; i < 128; ++i)
diff --git a/src/protocol/inspircd20.h b/src/protocol/inspircd20.h
index 24e3a930e..20aec2ec5 100644
--- a/src/protocol/inspircd20.h
+++ b/src/protocol/inspircd20.h
@@ -110,20 +110,6 @@ struct chmodeinfo
{0, 0}
};
-inline uint32 get_mode_from_char(const char c)
-{
- struct chmodeinfo *p = chmodes;
-
- while (p->modechar != 0)
- {
- if (p->modechar == c)
- return p->mode;
- ++p;
- }
-
- return 0;
-}
-
void inspircd_set_umode(User * user, int ac, char **av);
void inspircd_cmd_svsnoop(char *server, int set);
void inspircd_cmd_remove_akill(char *user, char *host);
diff --git a/version.log b/version.log
index 89af633ea..372860357 100644
--- a/version.log
+++ b/version.log
@@ -8,7 +8,7 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="4"
VERSION_EXTRA="-git"
-VERSION_BUILD="3032"
+VERSION_BUILD="3033"
# $Log$ # Changes since the 1.8.4 Release
#Revision 3031 - Added InspIRCd 2.0 support