MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-10-03 06:08:52 +02:00
Code Issues Releases Wiki Activity

ircd::mapi: Rectify linkage of the header symbol name string.

Browse source
This commit is contained in:
Jason Volk 2016-11-02 15:12:56 -07:00
parent 0d2d21b49f
commit da78598d86
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/ircd/mapi.h
View file

@ -53,9 +53,13 @@ struct exports
template<class... List> exports(List&&... list);
};
const char *const header_symbol_name
{
"IRCD_MODULE"
};
struct header
{
static const char *const sym_name;
static constexpr const magic_t MAGIC
{
0x4D41
@ -113,12 +117,6 @@ noexcept
mods::static_destruction = true;
}
const char *const
header::sym_name
{
"IRCD_MODULE"
};
inline auto &
header::operator[](const std::string &key)
{

2
ircd/mods_mod.h
View file

@ -62,7 +62,7 @@ try
}
,header
{
&handle.get<mapi::header>(mapi::header::sym_name)
&handle.get<mapi::header>(mapi::header_symbol_name)
}
{
if(unlikely(!header))

2
ircd/modules.cc
View file

@ -507,7 +507,7 @@ ircd::mods::is_module(const filesystem::path &path)
path.string().c_str());
const auto syms(symbols(path));
const auto &header_name(mapi::header::sym_name);
const auto &header_name(mapi::header_symbol_name);
const auto it(std::find(begin(syms), end(syms), header_name));
if(it == end(syms))
throw error("`%s': has no MAPI header (%s)",