Merge branch 'insp3' into master.

4 files changed, 26 insertions, 26 deletions

diff --git a/include/clientprotocol.h b/include/clientprotocol.h
index 1301a2513..6e5eb56d8 100644
--- a/include/clientprotocol.h
+++ b/include/clientprotocol.h
@@ -34,7 +34,7 @@ namespace ClientProtocol
 /** Contains a message parsed from wire format.
  * Used by Serializer::Parse().
  */
-struct ClientProtocol::ParseOutput final
+struct CoreExport ClientProtocol::ParseOutput final
 {
 	/** Command name, must not be empty.
 	 */
@@ -51,7 +51,7 @@ struct ClientProtocol::ParseOutput final
 
 /** A selection of zero or more tags in a TagMap.
  */
-class ClientProtocol::TagSelection final
+class CoreExport ClientProtocol::TagSelection final
 {
 	std::bitset<64> selection;
 
@@ -90,7 +90,7 @@ public:
 	}
 };
 
-class ClientProtocol::MessageSource
+class CoreExport ClientProtocol::MessageSource
 {
 	User* sourceuser;
 	const std::string* sourcestr;
@@ -178,7 +178,7 @@ public:
  * All messages have a command name, a list of parameters and a map of tags, the last two can be empty.
  * They also always have a source, see class MessageSource.
  */
-class ClientProtocol::Message
+class CoreExport ClientProtocol::Message
 	: public ClientProtocol::MessageSource
 {
 public:
@@ -472,7 +472,7 @@ public:
  *
  * Event hooks attached to a specific event can alter the messages sent for that event.
  */
-class ClientProtocol::Event
+class CoreExport ClientProtocol::Event
 {
 	EventProvider* event;
 	Message* initialmsg = nullptr;
@@ -524,7 +524,7 @@ public:
 	void GetMessagesForUser(LocalUser* user, MessageList& messagelist);
 };
 
-class ClientProtocol::MessageTagEvent
+class CoreExport ClientProtocol::MessageTagEvent
 	: public Events::ModuleEventProvider
 {
 public:
@@ -539,7 +539,7 @@ public:
  * with tags before the message is sent and they have the job of determining whether a user should
  * get a message tag or be allowed to send one.
  */
-class ClientProtocol::MessageTagProvider
+class CoreExport ClientProtocol::MessageTagProvider
 	: public Events::ModuleEventListener
 {
 public:
@@ -587,7 +587,7 @@ public:
  * A protocol event hook is attached to a single event type. It has the ability to alter or block messages
  * sent to users which belong to the event the hook is attached to.
  */
-class ClientProtocol::EventHook
+class CoreExport ClientProtocol::EventHook
 	: public Events::ModuleEventListener
 {
 public:
@@ -632,7 +632,7 @@ public:
  * Protocol event hooks can be attached to the instances of these providers. The core has event
  * providers for most common IRC events defined in RFC1459.
  */
-class ClientProtocol::EventProvider final
+class CoreExport ClientProtocol::EventProvider final
 	: public Events::ModuleEventProvider
 {
 public:
@@ -650,7 +650,7 @@ public:
 /** Commonly used client protocol events.
  * Available via InspIRCd::GetRFCEvents().
  */
-struct ClientProtocol::RFCEvents final
+struct CoreExport ClientProtocol::RFCEvents final
 {
 	EventProvider numeric;
 	EventProvider join;
diff --git a/include/clientprotocolevent.h b/include/clientprotocolevent.h
index f8aacd996..9c685def4 100644
--- a/include/clientprotocolevent.h
+++ b/include/clientprotocolevent.h
@@ -31,7 +31,7 @@ namespace ClientProtocol
 	}
 }
 
-struct ClientProtocol::Events::Join
+struct CoreExport ClientProtocol::Events::Join
 	: public ClientProtocol::Messages::Join, public ClientProtocol::Event
 {
 	Join()
@@ -52,7 +52,7 @@ struct ClientProtocol::Events::Join
 	}
 };
 
-class ClientProtocol::Events::Mode
+class CoreExport ClientProtocol::Events::Mode
 	: public ClientProtocol::Event
 {
 	std::list<ClientProtocol::Messages::Mode> modelist;
diff --git a/include/clientprotocolmsg.h b/include/clientprotocolmsg.h
index fb60d74cb..8c5eb4907 100644
--- a/include/clientprotocolmsg.h
+++ b/include/clientprotocolmsg.h
@@ -45,7 +45,7 @@ namespace ClientProtocol
  * The first parameter is the target of the numeric which is almost always the nick of the user
  * the numeric will be sent to.
  */
-class ClientProtocol::Messages::Numeric
+class CoreExport ClientProtocol::Messages::Numeric
 	: public ClientProtocol::Message
 {
 	char numericstr[4];
@@ -104,7 +104,7 @@ public:
 /** JOIN message.
  * Sent when a user joins a channel.
  */
-class ClientProtocol::Messages::Join
+class CoreExport ClientProtocol::Messages::Join
 	: public ClientProtocol::Message
 {
 	Membership* memb;
@@ -155,7 +155,7 @@ public:
 /** PART message.
  * Sent when a user parts a channel.
  */
-struct ClientProtocol::Messages::Part
+struct CoreExport ClientProtocol::Messages::Part
 	: public ClientProtocol::Message
 {
 	/** Constructor.
@@ -174,7 +174,7 @@ struct ClientProtocol::Messages::Part
 /** KICK message.
  * Sent when a user is kicked from a channel.
  */
-struct ClientProtocol::Messages::Kick
+struct CoreExport ClientProtocol::Messages::Kick
 	: public ClientProtocol::Message
 {
 	/** Constructor.
@@ -194,7 +194,7 @@ struct ClientProtocol::Messages::Kick
 /** QUIT message.
  * Sent when a user quits.
  */
-struct ClientProtocol::Messages::Quit
+struct CoreExport ClientProtocol::Messages::Quit
 	: public ClientProtocol::Message
 {
 	/** Constructor.
@@ -212,7 +212,7 @@ struct ClientProtocol::Messages::Quit
 /** NICK message.
  * Sent when a user changes their nickname.
  */
-struct ClientProtocol::Messages::Nick
+struct CoreExport ClientProtocol::Messages::Nick
 	: public ClientProtocol::Message
 {
 	/** Constructor.
@@ -229,7 +229,7 @@ struct ClientProtocol::Messages::Nick
 /** MODE message.
  * Sent when modes are changed on a user or channel.
  */
-class ClientProtocol::Messages::Mode
+class CoreExport ClientProtocol::Messages::Mode
 	: public ClientProtocol::Message
 {
 	Channel* chantarget;
@@ -395,7 +395,7 @@ public:
 
 /** TOPIC message.
  */
-struct ClientProtocol::Messages::Topic
+struct CoreExport ClientProtocol::Messages::Topic
 	: public ClientProtocol::Message
 {
 	/** Constructor.
@@ -413,7 +413,7 @@ struct ClientProtocol::Messages::Topic
 
 /** PRIVMSG and NOTICE message.
  */
-class ClientProtocol::Messages::Privmsg
+class CoreExport ClientProtocol::Messages::Privmsg
 	: public ClientProtocol::Message
 {
 	void PushTargetChan(char status, const Channel* targetchan)
@@ -626,7 +626,7 @@ public:
 /** INVITE message.
  * Sent when a user is invited to join a channel.
  */
-struct ClientProtocol::Messages::Invite
+struct CoreExport ClientProtocol::Messages::Invite
 	: public ClientProtocol::Message
 {
 	/** Constructor.
@@ -645,7 +645,7 @@ struct ClientProtocol::Messages::Invite
 /** PING message.
  * Used to check if a connection is still alive.
  */
-struct ClientProtocol::Messages::Ping
+struct CoreExport ClientProtocol::Messages::Ping
 	: public ClientProtocol::Message
 {
 	/** Constructor.
@@ -670,7 +670,7 @@ struct ClientProtocol::Messages::Ping
 /** PONG message.
  * Sent as a reply to PING.
  */
-struct ClientProtocol::Messages::Pong
+struct CoreExport ClientProtocol::Messages::Pong
 	: public ClientProtocol::Message
 {
 	/** Constructor.
@@ -688,7 +688,7 @@ struct ClientProtocol::Messages::Pong
 /** ERROR message.
  * Sent to clients upon disconnection.
  */
-struct ClientProtocol::Messages::Error
+struct CoreExport ClientProtocol::Messages::Error
 	: public ClientProtocol::Message
 {
 	/** Constructor.
diff --git a/include/typedefs.h b/include/typedefs.h
index 537c1b467..880f222fb 100644
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -56,7 +56,7 @@ namespace ClientProtocol
 	typedef std::vector<std::string> ParamList;
 	typedef std::string SerializedMessage;
 
-	struct MessageTagData final
+	struct CoreExport MessageTagData final
 	{
 		MessageTagProvider* tagprov;
 		std::string value;