diff options
| author | DukePyrolator <DukePyrolator@anope.org> | 2010-12-26 09:36:45 +0100 |
|---|---|---|
| committer | DukePyrolator <DukePyrolator@anope.org> | 2010-12-26 09:36:45 +0100 |
| commit | f638d1078ab5ab630ce9393fe87edd630abdf75a (patch) | |
| tree | 2afbda6b0a653324657e41d3ddc8a698a37e3b29 /include | |
| parent | 4235df2b28a26cb166a250d016f1fd9b417cb94b (diff) | |
| parent | 8af2465a61b09e020c1324acfb78bbf912869fc8 (diff) | |
Merge branch '1.9' of ssh://anope.git.sourceforge.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'include')
| -rw-r--r-- | include/commands.h | 2 | ||||
| -rw-r--r-- | include/hashcomp.h | 4 | ||||
| -rw-r--r-- | include/services.h | 2 | ||||
| -rw-r--r-- | include/sockets.h | 2 | ||||
| -rw-r--r-- | include/version.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/include/commands.h b/include/commands.h index 6c7ef7494..f05b1a5db 100644 --- a/include/commands.h +++ b/include/commands.h @@ -44,7 +44,7 @@ enum CommandFlag }; /* The source for a command */ -struct CommandSource +struct CoreExport CommandSource { /* User executing the command */ User *u; diff --git a/include/hashcomp.h b/include/hashcomp.h index b99b97aa4..fa502b498 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -176,7 +176,7 @@ namespace irc /** Used to hash irc::strings for unordered_map */ - struct hash + struct CoreExport hash { /* VS 2008 specific code */ enum { bucket_size = 4, min_buckets = 8 }; @@ -253,7 +253,7 @@ namespace ci /** Used to hash ci::strings for unordered_map */ - struct hash + struct CoreExport hash { /* VS 2008 specific code */ enum { bucket_size = 4, min_buckets = 8 }; diff --git a/include/services.h b/include/services.h index d86729e51..5448d9170 100644 --- a/include/services.h +++ b/include/services.h @@ -765,7 +765,7 @@ enum EntryType ENTRYTYPE_HOST }; -class Entry : public Flags<EntryType> +class CoreExport Entry : public Flags<EntryType> { Anope::string mask; diff --git a/include/sockets.h b/include/sockets.h index c9e5bfed0..d5457cf05 100644 --- a/include/sockets.h +++ b/include/sockets.h @@ -340,7 +340,7 @@ class CoreExport ConnectionSocket : public BufferedSocket void Connect(const Anope::string &TargetHost, int Port, const Anope::string &BindHost = ""); }; -class ClientSocket : public BufferedSocket +class CoreExport ClientSocket : public BufferedSocket { public: /* Listen socket this connection came from */ diff --git a/include/version.cpp b/include/version.cpp index 9b8f38c45..8cf362726 100644 --- a/include/version.cpp +++ b/include/version.cpp @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) for (std::list<std::pair<std::string, std::string> >::iterator it = versions.begin(), it_end = versions.end(); it != it_end; ++it) { if (it->first == "EXTRA") - fd << "#define VERSION_EXTRA \"" << (!version_extra.empty() ? version_extra : "") << it->second << "\"" << std::endl; + fd << "#define VERSION_EXTRA \"" << (!version_extra.empty() ? version_extra : "") << (version_extra.find(it->second) == std::string::npos ? it->second : "") << "\"" << std::endl; else fd << "#define VERSION_" << it->first << " " << it->second << std::endl; } |