MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-05-18 10:53:48 +02:00
Code Issues Releases Wiki Activity

configure: Remove the CPPDEFINE for RB_TIME_CONFIGURED.

Browse source
This commit is contained in:
Jason Volk 2019-06-13 14:33:22 -06:00
parent 6aae730d5a
commit 3d04ed9ad0
4 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure.ac
View file

@ -1735,11 +1735,8 @@ RB_DEFINE_UNQUOTED([DATESTR], ["$RB_DATESTR"], [Readable date string of configur
DATECODE_CMD="date +%s"
RB_DATECODE=`$DATECODE_CMD`
RB_DEFINE_UNQUOTED([DATECODE], [$RB_DATECODE], [UNIX epoch time at configuration time.])
dnl TODO: XXX: These have better names than the above, rm previous eventually.
RB_DEFINE_UNQUOTED([TIME_CONFIGURED], [$RB_DATECODE], [UNIX epoch time at configuration time.])
RB_DEFINE_UNQUOTED([DATE_CONFIGURED], ["$RB_DATESTR"], [Convenience string of RB_TIME_CONFIGURED])
CPPDEFINE([RB_TIME_CONFIGURED], [$(date +%s)])
dnl
dnl --with-custom-branding

4
construct/construct.cc
View file

@ -270,12 +270,12 @@ try
ircd::info::tag,
};
if(RB_DATECODE > ircd::info::configured_time || RB_DATECODE < ircd::info::configured_time)
if(RB_TIME_CONFIGURED > ircd::info::configured_time || RB_TIME_CONFIGURED < ircd::info::configured_time)
ircd::log::warning
{
"Header configuration time:%ld %s than library configuration time:%ld.",
RB_VERSION_TAG,
RB_DATECODE > ircd::info::configured_time? "newer" : "older",
RB_TIME_CONFIGURED > ircd::info::configured_time? "newer" : "older",
ircd::info::tag,
};

12
include/ircd/mods/mapi.h
View file

@ -100,12 +100,12 @@ IRCD_MAPI_SERIAL
///
struct ircd::mapi::header
{
const magic_t magic {IRCD_MAPI_MAGIC}; // The magic must match
const version_t version {IRCD_MAPI_VERSION}; // Version indicator
const serial_t serial {IRCD_MAPI_SERIAL}; // Serial indicator
const int64_t timestamp {RB_DATECODE}; // Module's compile epoch
std::unique_ptr<metablock> meta; // Non-standard-layout header data
mods::mod *self {nullptr}; // Point to mod instance once loaded
const magic_t magic {IRCD_MAPI_MAGIC}; // The magic must match
const version_t version {IRCD_MAPI_VERSION}; // Version indicator
const serial_t serial {IRCD_MAPI_SERIAL}; // Serial indicator
const int64_t timestamp {RB_TIME_CONFIGURED}; // Module's compile epoch (TODO: XXX)
std::unique_ptr<metablock> meta; // Non-standard-layout header data
mods::mod *self {nullptr}; // Point to mod instance once loaded
// get and set metadata
const string_view &operator[](const string_view &s) const;

2
modules/console.cc
View file

@ -669,8 +669,8 @@ console_cmd__version(opt &out, const string_view &line)
out << "info::startup " << info::startup << std::endl;
out << std::endl;
out << "RB_DATECODE " << RB_DATECODE << std::endl;
out << "RB_DATESTR " << RB_DATESTR << std::endl;
out << "RB_TIME_CONFIGURED " << RB_TIME_CONFIGURED << std::endl;
out << "RB_DATE_CONFIGURED " << RB_DATE_CONFIGURED << std::endl;
out << std::endl;