Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9

11 files changed, 151 insertions, 151 deletions

diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp
index 2c41b4b90..b53510c10 100644
--- a/modules/commands/bs_kick.cpp
+++ b/modules/commands/bs_kick.cpp
@@ -58,7 +58,7 @@ class CommandBSKick : public Command
 					{
 						try
 						{
-							ci->ttb[TTB_BADWORDS] = convertTo<int16>(ttb);
+							ci->ttb[TTB_BADWORDS] = convertTo<int16_t>(ttb);
 							if (ci->ttb[TTB_BADWORDS] < 0)
 								throw ConvertException();
 						}
@@ -96,7 +96,7 @@ class CommandBSKick : public Command
 					{
 						try
 						{
-							ci->ttb[TTB_BOLDS] = convertTo<int16>(ttb);
+							ci->ttb[TTB_BOLDS] = convertTo<int16_t>(ttb);
 							if (ci->ttb[TTB_BOLDS] < 0)
 								throw ConvertException();
 						}
@@ -132,7 +132,7 @@ class CommandBSKick : public Command
 					{
 						try
 						{
-							ci->ttb[TTB_CAPS] = convertTo<int16>(ttb);
+							ci->ttb[TTB_CAPS] = convertTo<int16_t>(ttb);
 							if (ci->ttb[TTB_CAPS] < 0)
 								throw ConvertException();
 						}
@@ -149,7 +149,7 @@ class CommandBSKick : public Command
 					ci->capsmin = 10;
 					try
 					{
-						ci->capsmin = convertTo<int16>(min);
+						ci->capsmin = convertTo<int16_t>(min);
 					}
 					catch (const ConvertException &) { }
 					if (ci->capsmin < 1)
@@ -158,7 +158,7 @@ class CommandBSKick : public Command
 					ci->capspercent = 25;
 					try
 					{
-						ci->capspercent = convertTo<int16>(percent);
+						ci->capspercent = convertTo<int16_t>(percent);
 					}
 					catch (const ConvertException &) { }
 					if (ci->capspercent < 1 || ci->capspercent > 100)
@@ -187,7 +187,7 @@ class CommandBSKick : public Command
 					{
 						try
 						{
-							ci->ttb[TTB_COLORS] = convertTo<int16>(ttb);
+							ci->ttb[TTB_COLORS] = convertTo<int16_t>(ttb);
 							if (ci->ttb[TTB_COLORS] < 1)
 								throw ConvertException();
 						}
@@ -224,7 +224,7 @@ class CommandBSKick : public Command
 					{
 						try
 						{
-							ci->ttb[TTB_FLOOD] = convertTo<int16>(ttb);
+							ci->ttb[TTB_FLOOD] = convertTo<int16_t>(ttb);
 							if (ci->ttb[TTB_FLOOD] < 1)
 								throw ConvertException();
 						}
@@ -241,7 +241,7 @@ class CommandBSKick : public Command
 					ci->floodlines = 6;
 					try
 					{
-						ci->floodlines = convertTo<int16>(lines);
+						ci->floodlines = convertTo<int16_t>(lines);
 					}
 					catch (const ConvertException &) { }
 					if (ci->floodlines < 2)
@@ -250,7 +250,7 @@ class CommandBSKick : public Command
 					ci->floodsecs = 10;
 					try
 					{
-						ci->floodsecs = convertTo<int16>(secs);
+						ci->floodsecs = convertTo<int16_t>(secs);
 					}
 					catch (const ConvertException &) { }
 					if (ci->floodsecs < 1)
@@ -280,7 +280,7 @@ class CommandBSKick : public Command
 					{
 						try
 						{
-							ci->ttb[TTB_REPEAT] = convertTo<int16>(ttb);
+							ci->ttb[TTB_REPEAT] = convertTo<int16_t>(ttb);
 							if (ci->ttb[TTB_REPEAT] < 0)
 								throw ConvertException();
 						}
@@ -297,7 +297,7 @@ class CommandBSKick : public Command
 					ci->repeattimes = 3;
 					try
 					{
-						ci->repeattimes = convertTo<int16>(times);
+						ci->repeattimes = convertTo<int16_t>(times);
 					}
 					catch (const ConvertException &) { }
 					if (ci->repeattimes < 2)
@@ -326,7 +326,7 @@ class CommandBSKick : public Command
 					{
 						try
 						{
-							ci->ttb[TTB_REVERSES] = convertTo<int16>(ttb);
+							ci->ttb[TTB_REVERSES] = convertTo<int16_t>(ttb);
 							if (ci->ttb[TTB_REVERSES] < 0)
 								throw ConvertException();
 						}
@@ -359,7 +359,7 @@ class CommandBSKick : public Command
 					{
 						try
 						{
-							ci->ttb[TTB_UNDERLINES] = convertTo<int16>(ttb);
+							ci->ttb[TTB_UNDERLINES] = convertTo<int16_t>(ttb);
 							if (ci->ttb[TTB_REVERSES] < 0)
 								throw ConvertException();
 						}
@@ -393,7 +393,7 @@ class CommandBSKick : public Command
 					{
 						try
 						{
-							ci->ttb[TTB_ITALICS] = convertTo<int16>(ttb);
+							ci->ttb[TTB_ITALICS] = convertTo<int16_t>(ttb);
 							if (ci->ttb[TTB_ITALICS] < 0)
 								throw ConvertException();
 						}
@@ -427,7 +427,7 @@ class CommandBSKick : public Command
 					{
 						try
 						{
-							ci->ttb[TTB_AMSGS] = convertTo<int16>(ttb);
+							ci->ttb[TTB_AMSGS] = convertTo<int16_t>(ttb);
 							if (ci->ttb[TTB_AMSGS] < 0)
 								throw ConvertException();
 						}
@@ -583,7 +583,7 @@ struct BanData : public ExtensibleItem
 	{
 		Anope::string mask;
 		time_t last_use;
-		int16 ttb[TTB_SIZE];
+		int16_t ttb[TTB_SIZE];
 
 		Data()
 		{
@@ -648,13 +648,13 @@ struct UserData : public ExtensibleItem
 	time_t last_use;
 
 	/* for flood kicker */
-	int16 lines;
+	int16_t lines;
 	time_t last_start;
 
 	/* for repeat kicker */
 	Anope::string lastline;
 	Anope::string lasttarget;
-	int16 times;
+	int16_t times;
 
 	void OnDelete()
 	{
@@ -675,7 +675,7 @@ class BanDataPurger : public CallBack
 		for (channel_map::iterator it = ChannelList.begin(), it_end = ChannelList.end(); it != it_end; ++it)
 		{
 			Channel *c = it->second;
-			
+
 			BanData *bd = c->GetExt<BanData *>("bs_main_bandata");
 			if (bd != NULL)
 			{
@@ -863,7 +863,7 @@ class BSKick : public Module
 			if (ci->botflags.HasFlag(BS_KICK_CAPS) && realbuf.length() >= ci->capsmin)
 			{
 				int i = 0, l = 0;
-	
+
 				for (unsigned j = 0, end = realbuf.length(); j < end; ++j)
 				{
 					if (isupper(realbuf[j]))
@@ -884,7 +884,7 @@ class BSKick : public Module
 					return;
 				}
 			}
-			
+
 			/* Bad words kicker */
 			if (ci->botflags.HasFlag(BS_KICK_BADWORDS))
 			{
@@ -962,7 +962,7 @@ class BSKick : public Module
 				}
 
 				UserData *ud = NULL;
-				
+
 				/* Flood kicker */
 				if (ci->botflags.HasFlag(BS_KICK_FLOOD))
 				{
diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp
index 3e737b709..7cfbb303d 100644
--- a/modules/commands/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
@@ -19,12 +19,12 @@ enum
 	ACCESS_FOUNDER = 10001
 };
 
-static std::map<Anope::string, int16, std::less<ci::string> > defaultLevels;
+static std::map<Anope::string, int16_t, std::less<ci::string> > defaultLevels;
 
 static void reset_levels(ChannelInfo *ci)
 {
 	ci->ClearLevels();
-	for (std::map<Anope::string, int16, std::less<ci::string> >::iterator it = defaultLevels.begin(), it_end = defaultLevels.end(); it != it_end; ++it)
+	for (std::map<Anope::string, int16_t, std::less<ci::string> >::iterator it = defaultLevels.begin(), it_end = defaultLevels.end(); it != it_end; ++it)
 		ci->SetLevel(it->first, it->second);
 }
 
@@ -286,7 +286,7 @@ class CommandCSAccess : public Command
 
 		Anope::string mask = params[2];
 		int level = ACCESS_INVALID;
-		
+
 		try
 		{
 			level = convertTo<int>(params[3]);
@@ -736,7 +736,7 @@ class CommandCSLevels : public Command
 		for (unsigned i = 0; i < privs.size(); ++i)
 		{
 			const Privilege &p = privs[i];
-			int16 j = ci->GetLevel(p.name);
+			int16_t j = ci->GetLevel(p.name);
 
 			if (j == ACCESS_INVALID)
 				source.Reply(_("    %-*s  (disabled)"), levelinfo_maxwidth, p.name.c_str());
@@ -918,7 +918,7 @@ class CSAccess : public Module
 		if (group->ci == NULL)
 			return EVENT_CONTINUE;
 		/* Special case. Allows a level of < 0 to match anyone, and a level of 0 to match anyone identified. */
-		int16 level = group->ci->GetLevel(priv);
+		int16_t level = group->ci->GetLevel(priv);
 		if (level < 0)
 			return EVENT_ALLOW;
 		else if (level == 0 && group->nc)
diff --git a/modules/commands/cs_set_bantype.cpp b/modules/commands/cs_set_bantype.cpp
index afc15963b..90c94b5a4 100644
--- a/modules/commands/cs_set_bantype.cpp
+++ b/modules/commands/cs_set_bantype.cpp
@@ -40,7 +40,7 @@ class CommandCSSetBanType : public Command
 
 		try
 		{
-			int16 new_type = convertTo<int16>(params[1]);
+			int16_t new_type = convertTo<int16_t>(params[1]);
 			if (new_type < 0 || new_type > 3)
 				throw ConvertException("Invalid range");
 			ci->bantype = new_type;
diff --git a/modules/commands/ms_set.cpp b/modules/commands/ms_set.cpp
index ef3480fd5..7ce1960ed 100644
--- a/modules/commands/ms_set.cpp
+++ b/modules/commands/ms_set.cpp
@@ -75,7 +75,7 @@ class CommandMSSet : public Command
 		Anope::string p2 = params.size() > 2 ? params[2] : "";
 		Anope::string p3 = params.size() > 3 ? params[3] : "";
 		Anope::string user, chan;
-		int16 limit;
+		int16_t limit;
 		NickCore *nc = u->Account();
 		ChannelInfo *ci = NULL;
 		bool is_servadmin = u->HasPriv("memoserv/set-limit");
@@ -136,7 +136,7 @@ class CommandMSSet : public Command
 			limit = -1;
 			try
 			{
-				limit = convertTo<int16>(p1);
+				limit = convertTo<int16_t>(p1);
 			}
 			catch (const ConvertException &) { }
 		}
@@ -160,7 +160,7 @@ class CommandMSSet : public Command
 			limit = -1;
 			try
 			{
-				limit = convertTo<int16>(p1);
+				limit = convertTo<int16_t>(p1);
 			}
 			catch (const ConvertException &) { }
 			/* The first character is a digit, but we could still go negative
diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp
index 440713a6e..92a108673 100644
--- a/modules/database/db_old.cpp
+++ b/modules/database/db_old.cpp
@@ -295,7 +295,7 @@ void close_db(dbFILE *f)
 	delete f;
 }
 
-static int read_int16(int16 *ret, dbFILE *f)
+static int read_int16(int16_t *ret, dbFILE *f)
 {
 	int c1, c2;
 
@@ -309,7 +309,7 @@ static int read_int16(int16 *ret, dbFILE *f)
 	return 0;
 }
 
-static int read_uint16(uint16 *ret, dbFILE *f)
+static int read_uint16(uint16_t *ret, dbFILE *f)
 {
 	int c1, c2;
 
@@ -326,7 +326,7 @@ static int read_uint16(uint16 *ret, dbFILE *f)
 static int read_string(Anope::string &str, dbFILE *f)
 {
 	str.clear();
-	uint16 len;
+	uint16_t len;
 
 	if (read_uint16(&len, f) < 0)
 		return -1;
@@ -343,7 +343,7 @@ static int read_string(Anope::string &str, dbFILE *f)
 	return 0;
 }
 
-static int read_uint32(uint32 *ret, dbFILE *f)
+static int read_uint32(uint32_t *ret, dbFILE *f)
 {
 	int c1, c2, c3, c4;
 
@@ -359,7 +359,7 @@ static int read_uint32(uint32 *ret, dbFILE *f)
 	return 0;
 }
 
-int read_int32(int32 *ret, dbFILE *f)
+int read_int32(int32_t *ret, dbFILE *f)
 {
 	int c1, c2, c3, c4;
 
@@ -402,7 +402,7 @@ static void LoadNicks()
 			READ(read_string(buffer, f));
 			nc->greet = buffer;
 
-			uint32 uint;
+			uint32_t uint;
 			READ(read_uint32(&uint, f));
 			//nc->icq = uint;
 
@@ -445,7 +445,7 @@ static void LoadNicks()
 			if (uint & OLD_NI_NOEXPIRE)
 				nc->Extend("noexpire", NULL);
 
-			uint16 u16;
+			uint16_t u16;
 			READ(read_uint16(&u16, f));
 			switch (u16)
 			{
@@ -494,22 +494,22 @@ static void LoadNicks()
 			}
 
 			READ(read_uint16(&u16, f));
-			for (uint16 j = 0; j < u16; ++j)
+			for (uint16_t j = 0; j < u16; ++j)
 			{
 				READ(read_string(buffer, f));
 				nc->access.push_back(buffer);
 			}
 
-			int16 i16;
+			int16_t i16;
 			READ(read_int16(&i16, f));
 			READ(read_int16(&nc->memos.memomax, f));
-			for (int16 j = 0; j < i16; ++j)
+			for (int16_t j = 0; j < i16; ++j)
 			{
 				Memo *m = new Memo;
 				READ(read_uint32(&uint, f));
-				uint16 flags;
+				uint16_t flags;
 				READ(read_uint16(&flags, f));
-				int32 tmp32;
+				int32_t tmp32;
 				READ(read_int32(&tmp32, f));
 				m->time = tmp32;
 				char sbuf[32];
@@ -523,7 +523,7 @@ static void LoadNicks()
 
 			Log(LOG_DEBUG) << "Loaded NickCore " << nc->display;
 		}
-	
+
 	for (int i = 0; i < 1024; ++i)
 		for (int c; (c = getc_db(f)) == 1;)
 		{
@@ -535,13 +535,13 @@ static void LoadNicks()
 			READ(read_string(last_realname, f));
 			READ(read_string(last_quit, f));
 
-			int32 tmp32;
+			int32_t tmp32;
 			READ(read_int32(&tmp32, f));
 			time_registered = tmp32;
 			READ(read_int32(&tmp32, f));
 			last_seen = tmp32;
 
-			uint16 tmpu16;
+			uint16_t tmpu16;
 			READ(read_uint16(&tmpu16, f));
 			Anope::string core;
 			READ(read_string(core, f));
@@ -563,7 +563,7 @@ static void LoadNicks()
 
 			Log(LOG_DEBUG) << "Loaded NickAlias " << na->nick;
 		}
-	
+
 	close_db(f); /* End of section Ia */
 }
 
@@ -576,7 +576,7 @@ static void LoadVHosts()
 	for (int c; (c = getc_db(f)) == 1;)
 	{
 		Anope::string nick, ident, host, creator;
-		int32 vtime;
+		int32_t vtime;
 
 		READ(read_string(nick, f));
 		READ(read_string(ident, f));
@@ -595,7 +595,7 @@ static void LoadVHosts()
 
 		Log() << "Loaded vhost for " << na->nick;
 	}
-	
+
 	close_db(f);
 }
 
@@ -608,8 +608,8 @@ static void LoadBots()
 	for (int c; (c = getc_db(f)) == 1;)
 	{
 		Anope::string nick, user, host, real;
-		int16 flags, chancount;
-		int32 created;
+		int16_t flags, chancount;
+		int32_t created;
 
 		READ(read_string(nick, f));
 		READ(read_string(user, f));
@@ -659,7 +659,7 @@ static void LoadChannels()
 			READ(read_string(buffer, f));
 			READ(read_string(buffer, f));
 
-			int32 tmp32;
+			int32_t tmp32;
 			READ(read_int32(&tmp32, f));
 			ci->time_registered = tmp32;
 
@@ -674,7 +674,7 @@ static void LoadChannels()
 			READ(read_int32(&tmp32, f));
 			ci->last_topic_time = tmp32;
 
-			uint32 tmpu32;
+			uint32_t tmpu32;
 			READ(read_uint32(&tmpu32, f));
 			// Temporary flags cleanup
 			tmpu32 &= ~0x80000000;
@@ -708,26 +708,26 @@ static void LoadChannels()
 			READ(read_string(buffer, f));
 			READ(read_string(buffer, f));
 
-			int16 tmp16;
+			int16_t tmp16;
 			READ(read_int16(&tmp16, f));
 			ci->bantype = tmp16;
 
 			READ(read_int16(&tmp16, f));
 			if (tmp16 > 36)
 				tmp16 = 36;
-			for (int16 j = 0; j < tmp16; ++j)
+			for (int16_t j = 0; j < tmp16; ++j)
 			{
-				int16 level;
+				int16_t level;
 				READ(read_int16(&level, f));
 
 				ci->SetLevel(GetLevelName(j), level);
 			}
 
-			uint16 tmpu16;
+			uint16_t tmpu16;
 			READ(read_uint16(&tmpu16, f));
-			for (uint16 j = 0; j < tmpu16; ++j)
+			for (uint16_t j = 0; j < tmpu16; ++j)
 			{
-				uint16 in_use;
+				uint16_t in_use;
 				READ(read_uint16(&in_use, f));
 				if (in_use)
 				{
@@ -738,7 +738,7 @@ static void LoadChannels()
 					ChanAccess *access = provider->Create();
 					access->ci = ci;
 
-					int16 level;
+					int16_t level;
 					READ(read_int16(&level, f));
 					access->Unserialize(stringify(level));
 
@@ -756,9 +756,9 @@ static void LoadChannels()
 			}
 
 			READ(read_uint16(&tmpu16, f));
-			for (uint16 j = 0; j < tmpu16; ++j)
+			for (uint16_t j = 0; j < tmpu16; ++j)
 			{
-				uint16 flags;
+				uint16_t flags;
 				READ(read_uint16(&flags, f));
 				if (flags & 0x0001)
 				{
@@ -781,7 +781,7 @@ static void LoadChannels()
 
 			READ(read_int16(&tmp16, f));
 			READ(read_int16(&ci->memos.memomax, f));
-			for (int16 j = 0; j < tmp16; ++j)
+			for (int16_t j = 0; j < tmp16; ++j)
 			{
 				READ(read_uint32(&tmpu32, f));
 				READ(read_uint16(&tmpu16, f));
@@ -829,9 +829,9 @@ static void LoadChannels()
 				ci->botflags.SetFlag(BS_KICK_REPEAT);
 
 			READ(read_int16(&tmp16, f));
-			for (int16 j = 0; j < tmp16; ++j)
+			for (int16_t j = 0; j < tmp16; ++j)
 			{
-				int16 ttb;
+				int16_t ttb;
 				READ(read_int16(&ttb, f));
 				if (j < TTB_SIZE)
 					ci->ttb[j] = ttb;
@@ -849,14 +849,14 @@ static void LoadChannels()
 			ci->repeattimes = tmp16;
 
 			READ(read_uint16(&tmpu16, f));
-			for (uint16 j = 0; j < tmpu16; ++j)
+			for (uint16_t j = 0; j < tmpu16; ++j)
 			{
-				uint16 in_use;
+				uint16_t in_use;
 				READ(read_uint16(&in_use, f));
 				if (in_use)
 				{
 					READ(read_string(buffer, f));
-					uint16 type;
+					uint16_t type;
 					READ(read_uint16(&type, f));
 
 					BadWordType bwtype = BW_ANY;
@@ -873,7 +873,7 @@ static void LoadChannels()
 
 			Log(LOG_DEBUG) << "Loaded channel " << ci->name;
 		}
-	
+
 	close_db(f);
 }
 
@@ -882,7 +882,7 @@ static void LoadOper()
 	dbFILE *f = open_db_read("OperServ", "oper.db", 13);
 	if (f == NULL)
 		return;
-	
+
 	XLineManager *akill, *sqline, *snline, *szline;
 	akill = sqline = snline = szline = NULL;
 
@@ -899,16 +899,16 @@ static void LoadOper()
 			szline = xl;
 	}
 
-	int32 tmp32;
+	int32_t tmp32;
 	READ(read_int32(&tmp32, f));
 	READ(read_int32(&tmp32, f));
 
-	int16 capacity;
+	int16_t capacity;
 	read_int16(&capacity, f); // AKill count
-	for (int16 i = 0; i < capacity; ++i)
+	for (int16_t i = 0; i < capacity; ++i)
 	{
 		Anope::string user, host, by, reason;
-		int32 seton, expires;
+		int32_t seton, expires;
 
 		READ(read_string(user, f));
 		READ(read_string(host, f));
@@ -926,10 +926,10 @@ static void LoadOper()
 	}
 
 	read_int16(&capacity, f); // SNLines
-	for (int16 i = 0; i < capacity; ++i)
+	for (int16_t i = 0; i < capacity; ++i)
 	{
 		Anope::string mask, by, reason;
-		int32 seton, expires;
+		int32_t seton, expires;
 
 		READ(read_string(mask, f));
 		READ(read_string(by, f));
@@ -946,10 +946,10 @@ static void LoadOper()
 	}
 
 	read_int16(&capacity, f); // SQLines
-	for (int16 i = 0; i < capacity; ++i)
+	for (int16_t i = 0; i < capacity; ++i)
 	{
 		Anope::string mask, by, reason;
-		int32 seton, expires;
+		int32_t seton, expires;
 
 		READ(read_string(mask, f));
 		READ(read_string(by, f));
@@ -966,10 +966,10 @@ static void LoadOper()
 	}
 
 	read_int16(&capacity, f); // SZLines
-	for (int16 i = 0; i < capacity; ++i)
+	for (int16_t i = 0; i < capacity; ++i)
 	{
 		Anope::string mask, by, reason;
-		int32 seton, expires;
+		int32_t seton, expires;
 
 		READ(read_string(mask, f));
 		READ(read_string(by, f));
diff --git a/modules/database/db_plain.cpp b/modules/database/db_plain.cpp
index 3605c0b9d..2424f22b6 100644
--- a/modules/database/db_plain.cpp
+++ b/modules/database/db_plain.cpp
@@ -68,7 +68,7 @@ EventReturn OnDatabaseReadMetadata(NickCore *nc, const Anope::string &key, const
 		if (key.equals_ci("LANGUAGE"))
 			nc->language = params[0];
 		else if (key.equals_ci("MEMOMAX"))
-			nc->memos.memomax = params[0].is_pos_number_only() ? convertTo<int16>(params[0]) : -1;
+			nc->memos.memomax = params[0].is_pos_number_only() ? convertTo<int16_t>(params[0]) : -1;
 		else if (key.equals_ci("EMAIL"))
 			nc->email = params[0];
 		else if (key.equals_ci("GREET"))
@@ -134,9 +134,9 @@ EventReturn OnDatabaseReadMetadata(ChannelInfo *ci, const Anope::string &key, co
 	try
 	{
 		if (key.equals_ci("BANTYPE"))
-			ci->bantype = params[0].is_pos_number_only() ? convertTo<int16>(params[0]) : Config->CSDefBantype;
+			ci->bantype = params[0].is_pos_number_only() ? convertTo<int16_t>(params[0]) : Config->CSDefBantype;
 		else if (key.equals_ci("MEMOMAX"))
-			ci->memos.memomax = params[0].is_pos_number_only() ? convertTo<int16>(params[0]) : -1;
+			ci->memos.memomax = params[0].is_pos_number_only() ? convertTo<int16_t>(params[0]) : -1;
 		else if (key.equals_ci("FOUNDER"))
 			ci->SetFounder(findcore(params[0]));
 		else if (key.equals_ci("SUCCESSOR"))
@@ -148,7 +148,7 @@ EventReturn OnDatabaseReadMetadata(ChannelInfo *ci, const Anope::string &key, co
 				Privilege *p = PrivilegeManager::FindPrivilege(params[j]);
 				if (p == NULL)
 					continue;
-				ci->SetLevel(p->name, params[j + 1].is_number_only() ? convertTo<int16>(params[j + 1]) : 0);
+				ci->SetLevel(p->name, params[j + 1].is_number_only() ? convertTo<int16_t>(params[j + 1]) : 0);
 			}
 		}
 		else if (key.equals_ci("FLAGS"))
@@ -217,7 +217,7 @@ EventReturn OnDatabaseReadMetadata(ChannelInfo *ci, const Anope::string &key, co
 				ak = ci->AddAkick(params[3], params[2], params.size() > 6 ? params[6] : "", params[4].is_pos_number_only() ? convertTo<time_t>(params[4]) : 0, params[5].is_pos_number_only() ? convertTo<time_t>(params[5]) : 0);
 			if (Nick)
 				ak->SetFlag(AK_ISNICK);
-	
+
 		}
 		else if (key.equals_ci("LOG"))
 		{
@@ -276,37 +276,37 @@ EventReturn OnDatabaseReadMetadata(ChannelInfo *ci, const Anope::string &key, co
 				for (unsigned j = 1, end = params.size(); j < end; j += 2)
 				{
 					if (params[j].equals_ci("BOLDS"))
-						ci->ttb[0] = params[j + 1].is_pos_number_only() ? convertTo<int16>(params[j + 1]) : 0;
+						ci->ttb[0] = params[j + 1].is_pos_number_only() ? convertTo<int16_t>(params[j + 1]) : 0;
 					else if (params[j].equals_ci("COLORS"))
-						ci->ttb[1] = params[j + 1].is_pos_number_only() ? convertTo<int16>(params[j + 1]) : 0;
+						ci->ttb[1] = params[j + 1].is_pos_number_only() ? convertTo<int16_t>(params[j + 1]) : 0;
 					else if (params[j].equals_ci("REVERSES"))
-						ci->ttb[2] = params[j + 1].is_pos_number_only() ? convertTo<int16>(params[j + 1]) : 0;
+						ci->ttb[2] = params[j + 1].is_pos_number_only() ? convertTo<int16_t>(params[j + 1]) : 0;
 					else if (params[j].equals_ci("UNDERLINES"))
-						ci->ttb[3] = params[j + 1].is_pos_number_only() ? convertTo<int16>(params[j + 1]) : 0;
+						ci->ttb[3] = params[j + 1].is_pos_number_only() ? convertTo<int16_t>(params[j + 1]) : 0;
 					else if (params[j].equals_ci("BADWORDS"))
-						ci->ttb[4] = params[j + 1].is_pos_number_only() ? convertTo<int16>(params[j + 1]) : 0;
+						ci->ttb[4] = params[j + 1].is_pos_number_only() ? convertTo<int16_t>(params[j + 1]) : 0;
 					else if (params[j].equals_ci("CAPS"))
-						ci->ttb[5] = params[j + 1].is_pos_number_only() ? convertTo<int16>(params[j + 1]) : 0;
+						ci->ttb[5] = params[j + 1].is_pos_number_only() ? convertTo<int16_t>(params[j + 1]) : 0;
 					else if (params[j].equals_ci("FLOOD"))
-						ci->ttb[6] = params[j + 1].is_pos_number_only() ? convertTo<int16>(params[j + 1]) : 0;
+						ci->ttb[6] = params[j + 1].is_pos_number_only() ? convertTo<int16_t>(params[j + 1]) : 0;
 					else if (params[j].equals_ci("REPEAT"))
-						ci->ttb[7] = params[j + 1].is_pos_number_only() ? convertTo<int16>(params[j + 1]) : 0;
+						ci->ttb[7] = params[j + 1].is_pos_number_only() ? convertTo<int16_t>(params[j + 1]) : 0;
 					else if (params[j].equals_ci("ITALICS"))
-						ci->ttb[8] = params[j + 1].is_pos_number_only() ? convertTo<int16>(params[j + 1]) : 0;
+						ci->ttb[8] = params[j + 1].is_pos_number_only() ? convertTo<int16_t>(params[j + 1]) : 0;
 					else if (params[j].equals_ci("AMSGS"))
-						ci->ttb[9] = params[j + 1].is_pos_number_only() ? convertTo<int16>(params[j + 1]) : 0;
+						ci->ttb[9] = params[j + 1].is_pos_number_only() ? convertTo<int16_t>(params[j + 1]) : 0;
 				}
 			}
 			else if (params[0].equals_ci("CAPSMIN"))
-				ci->capsmin = params[1].is_pos_number_only() ? convertTo<int16>(params[1]) : 0;
+				ci->capsmin = params[1].is_pos_number_only() ? convertTo<int16_t>(params[1]) : 0;
 			else if (params[0].equals_ci("CAPSPERCENT"))
-				ci->capspercent = params[1].is_pos_number_only() ? convertTo<int16>(params[1]) : 0;
+				ci->capspercent = params[1].is_pos_number_only() ? convertTo<int16_t>(params[1]) : 0;
 			else if (params[0].equals_ci("FLOODLINES"))
-				ci->floodlines = params[1].is_pos_number_only() ? convertTo<int16>(params[1]) : 0;
+				ci->floodlines = params[1].is_pos_number_only() ? convertTo<int16_t>(params[1]) : 0;
 			else if (params[0].equals_ci("FLOODSECS"))
-				ci->floodsecs = params[1].is_pos_number_only() ? convertTo<int16>(params[1]) : 0;
+				ci->floodsecs = params[1].is_pos_number_only() ? convertTo<int16_t>(params[1]) : 0;
 			else if (params[0].equals_ci("REPEATTIMES"))
-				ci->repeattimes = params[1].is_pos_number_only() ? convertTo<int16>(params[1]) : 0;
+				ci->repeattimes = params[1].is_pos_number_only() ? convertTo<int16_t>(params[1]) : 0;
 			else if (params[0].equals_ci("BADWORD"))
 			{
 				BadWordType Type;
@@ -505,7 +505,7 @@ static void LoadBotInfo(const std::vector<Anope::string> &params)
 		bi = new BotInfo(params[0], params[1], params[2]);
 
 	bi->created = params[3].is_pos_number_only() ? convertTo<time_t>(params[3]) : 0;
-	bi->chancount = params[4].is_pos_number_only() ? convertTo<uint32>(params[4]) : 0;
+	bi->chancount = params[4].is_pos_number_only() ? convertTo<uint32_t>(params[4]) : 0;
 	bi->realname = params[5];
 
 	Log(LOG_DEBUG_2) << "[db_plain]: Loaded botinfo for " << bi->nick;
@@ -531,7 +531,7 @@ static void LoadOperInfo(const std::vector<Anope::string> &params)
 {
 	if (params[0].equals_ci("STATS"))
 	{
-		maxusercnt = params[1].is_pos_number_only() ? convertTo<uint32>(params[1]) : 0;
+		maxusercnt = params[1].is_pos_number_only() ? convertTo<uint32_t>(params[1]) : 0;
 		maxusertime = params[2].is_pos_number_only() ? convertTo<time_t>(params[2]) : 0;
 	}
 	else if (params[0].equals_ci("SXLINE"))
diff --git a/modules/database/db_sql_live_read.cpp b/modules/database/db_sql_live_read.cpp
index 1159e41fc..b908949ab 100644
--- a/modules/database/db_sql_live_read.cpp
+++ b/modules/database/db_sql_live_read.cpp
@@ -303,7 +303,7 @@ class DBMySQL : public Module
 			this->OnAccessDel(ci, NULL, ci->GetAccess(i));
 	}
 
-	void OnLevelChange(User *u, ChannelInfo *ci, const Anope::string &priv, int16 what)
+	void OnLevelChange(User *u, ChannelInfo *ci, const Anope::string &priv, int16_t what)
 	{
 		this->Insert(ci->serialize_name(), ci->serialize());
 	}
diff --git a/modules/database/db_sql_live_write.cpp b/modules/database/db_sql_live_write.cpp
index 769c53b66..5d15d14d3 100644
--- a/modules/database/db_sql_live_write.cpp
+++ b/modules/database/db_sql_live_write.cpp
@@ -63,11 +63,11 @@ static void ChanInfoUpdate(const Anope::string &name, const SQLResult &res)
 				bi->Assign(NULL, ci);
 		}
 
-		ci->capsmin = convertTo<int16>(res.Get(0, "capsmin"));
-		ci->capspercent = convertTo<int16>(res.Get(0, "capspercent"));
-		ci->floodlines = convertTo<int16>(res.Get(0, "floodlines"));
-		ci->floodsecs = convertTo<int16>(res.Get(0, "floodsecs"));
-		ci->repeattimes = convertTo<int16>(res.Get(0, "repeattimes"));
+		ci->capsmin = convertTo<int16_t>(res.Get(0, "capsmin"));
+		ci->capspercent = convertTo<int16_t>(res.Get(0, "capspercent"));
+		ci->floodlines = convertTo<int16_t>(res.Get(0, "floodlines"));
+		ci->floodsecs = convertTo<int16_t>(res.Get(0, "floodsecs"));
+		ci->repeattimes = convertTo<int16_t>(res.Get(0, "repeattimes"));
 
 		if (ci->c)
 			check_modes(ci->c);
diff --git a/modules/encryption/enc_sha1.cpp b/modules/encryption/enc_sha1.cpp
index 4fe321bdc..a0854d762 100644
--- a/modules/encryption/enc_sha1.cpp
+++ b/modules/encryption/enc_sha1.cpp
@@ -18,27 +18,27 @@ A million repetitions of "a"
 
 struct SHA1_CTX
 {
-	uint32 state[5];
-	uint32 count[2];
+	uint32_t state[5];
+	uint32_t count[2];
 	unsigned char buffer[64];
 };
 
-void SHA1Transform(uint32 state[5], const unsigned char buffer[64]);
+void SHA1Transform(uint32_t state[5], const unsigned char buffer[64]);
 void SHA1Init(SHA1_CTX *context);
-void SHA1Update(SHA1_CTX *context, const unsigned char *data, uint32 len);
+void SHA1Update(SHA1_CTX *context, const unsigned char *data, uint32_t len);
 void SHA1Final(unsigned char digest[20], SHA1_CTX *context);
 
-inline static uint32 rol(uint32 value, uint32 bits) { return (value << bits) | (value >> (32 - bits)); }
+inline static uint32_t rol(uint32_t value, uint32_t bits) { return (value << bits) | (value >> (32 - bits)); }
 
 union CHAR64LONG16
 {
 	unsigned char c[64];
-	uint32 l[16];
+	uint32_t l[16];
 };
 
 /* blk0() and blk() perform the initial expand. */
 /* I got the idea of expanding during the round function from SSLeay */
-inline static uint32 blk0(CHAR64LONG16 *block, uint32 i)
+inline static uint32_t blk0(CHAR64LONG16 *block, uint32_t i)
 {
 #ifdef LITTLE_ENDIAN
 	return block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) | (rol(block->l[i], 8) & 0x00FF00FF);
@@ -46,20 +46,20 @@ inline static uint32 blk0(CHAR64LONG16 *block, uint32 i)
 	return block->l[i];
 #endif
 }
-inline static uint32 blk(CHAR64LONG16 *block, uint32 i) { return block->l[i & 15] = rol(block->l[(i + 13) & 15] ^ block->l[(i + 8) & 15] ^ block->l[(i + 2) & 15] ^ block->l[i & 15],1); }
+inline static uint32_t blk(CHAR64LONG16 *block, uint32_t i) { return block->l[i & 15] = rol(block->l[(i + 13) & 15] ^ block->l[(i + 8) & 15] ^ block->l[(i + 2) & 15] ^ block->l[i & 15],1); }
 
 /* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
-inline static void R0(CHAR64LONG16 *block, uint32 v, uint32 &w, uint32 x, uint32 y, uint32 &z, uint32 i) { z += ((w & (x ^ y)) ^ y) + blk0(block, i) + 0x5A827999 + rol(v, 5); w = rol(w, 30); }
-inline static void R1(CHAR64LONG16 *block, uint32 v, uint32 &w, uint32 x, uint32 y, uint32 &z, uint32 i) { z += ((w & (x ^ y)) ^ y) + blk(block, i) + 0x5A827999 + rol(v, 5); w = rol(w, 30); }
-inline static void R2(CHAR64LONG16 *block, uint32 v, uint32 &w, uint32 x, uint32 y, uint32 &z, uint32 i) { z += (w ^ x ^ y) + blk(block, i) + 0x6ED9EBA1 + rol(v, 5); w = rol(w, 30); }
-inline static void R3(CHAR64LONG16 *block, uint32 v, uint32 &w, uint32 x, uint32 y, uint32 &z, uint32 i) { z += (((w | x) & y) | (w & x)) + blk(block, i) + 0x8F1BBCDC + rol(v, 5); w = rol(w, 30); }
-inline static void R4(CHAR64LONG16 *block, uint32 v, uint32 &w, uint32 x, uint32 y, uint32 &z, uint32 i) { z += (w ^ x ^ y) + blk(block, i) + 0xCA62C1D6 + rol(v, 5); w = rol(w, 30); }
+inline static void R0(CHAR64LONG16 *block, uint32_t v, uint32_t &w, uint32_t x, uint32_t y, uint32_t &z, uint32_t i) { z += ((w & (x ^ y)) ^ y) + blk0(block, i) + 0x5A827999 + rol(v, 5); w = rol(w, 30); }
+inline static void R1(CHAR64LONG16 *block, uint32_t v, uint32_t &w, uint32_t x, uint32_t y, uint32_t &z, uint32_t i) { z += ((w & (x ^ y)) ^ y) + blk(block, i) + 0x5A827999 + rol(v, 5); w = rol(w, 30); }
+inline static void R2(CHAR64LONG16 *block, uint32_t v, uint32_t &w, uint32_t x, uint32_t y, uint32_t &z, uint32_t i) { z += (w ^ x ^ y) + blk(block, i) + 0x6ED9EBA1 + rol(v, 5); w = rol(w, 30); }
+inline static void R3(CHAR64LONG16 *block, uint32_t v, uint32_t &w, uint32_t x, uint32_t y, uint32_t &z, uint32_t i) { z += (((w | x) & y) | (w & x)) + blk(block, i) + 0x8F1BBCDC + rol(v, 5); w = rol(w, 30); }
+inline static void R4(CHAR64LONG16 *block, uint32_t v, uint32_t &w, uint32_t x, uint32_t y, uint32_t &z, uint32_t i) { z += (w ^ x ^ y) + blk(block, i) + 0xCA62C1D6 + rol(v, 5); w = rol(w, 30); }
 
 /* Hash a single 512-bit block. This is the core of the algorithm. */
 
-void SHA1Transform(uint32 state[5], const unsigned char buffer[64])
+void SHA1Transform(uint32_t state[5], const unsigned char buffer[64])
 {
-	uint32 a, b, c, d, e;
+	uint32_t a, b, c, d, e;
 	static unsigned char workspace[64];
 	CHAR64LONG16 *block = reinterpret_cast<CHAR64LONG16 *>(workspace);
 	memcpy(block, buffer, 64);
@@ -115,9 +115,9 @@ void SHA1Init(SHA1_CTX *context)
 
 /* Run your data through this. */
 
-void SHA1Update(SHA1_CTX *context, const unsigned char *data, uint32 len)
+void SHA1Update(SHA1_CTX *context, const unsigned char *data, uint32_t len)
 {
-	uint32 i, j;
+	uint32_t i, j;
 
 	j = (context->count[0] >> 3) & 63;
 	if ((context->count[0] += len << 3) < (len << 3))
@@ -140,7 +140,7 @@ void SHA1Update(SHA1_CTX *context, const unsigned char *data, uint32 len)
 
 void SHA1Final(unsigned char digest[21], SHA1_CTX *context)
 {
-	uint32 i;
+	uint32_t i;
 	unsigned char finalcount[8];
 
 	for (i = 0; i < 8; ++i)
diff --git a/modules/encryption/enc_sha256.cpp b/modules/encryption/enc_sha256.cpp
index 3034f3731..38dc4a841 100644
--- a/modules/encryption/enc_sha256.cpp
+++ b/modules/encryption/enc_sha256.cpp
@@ -65,41 +65,41 @@ class SHA256Context
 	unsigned tot_len;
 	unsigned len;
 	unsigned char block[2 * SHA256_BLOCK_SIZE];
-	uint32 h[8];
+	uint32_t h[8];
 };
 
-inline static uint32 SHFR(uint32 x, uint32 n) { return x >> n; }
-inline static uint32 ROTR(uint32 x, uint32 n) { return (x >> n) | (x << ((sizeof(x) << 3) - n)); }
-inline static uint32 ROTL(uint32 x, uint32 n) {