diff options
author | Naram Qashat <cyberbotx@cyberbotx.com> | 2010-06-26 01:39:11 -0400 |
---|---|---|
committer | Naram Qashat <cyberbotx@cyberbotx.com> | 2010-06-26 01:39:11 -0400 |
commit | 4e31757f1467b36034e1dcef10d78533ff302d57 (patch) | |
tree | 1cc9e0ec4f450c7fa33ced1b0e39a3355fedd636 /src/main.cpp | |
parent | 6dc3af5db41ecb24669b259c776c51964539d531 (diff) | |
parent | c7cb8897b400f5df31d0ae12dcce892a2b0d1590 (diff) |
Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp index cb63060ea..06f10ab3e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -25,7 +25,6 @@ #include "services.h" #include "timers.h" -#include "version.h" #include "modules.h" // getrlimit. @@ -34,6 +33,8 @@ # include <sys/resource.h> #endif +const char * const Anope::compiled = __TIME__ " " __DATE__; + /******** Global variables! ********/ /* Command-line options: (note that configuration variables are in config.c) */ @@ -74,12 +75,6 @@ time_t start_time; /* Parameters and environment */ char **my_av, **my_envp; -/* Moved here from version.h */ -const char version_number[] = VERSION_STRING; -const char version_number_dotted[] = VERSION_STRING_DOTTED; -const char version_build[] = "build #" BUILD ", compiled " __DATE__ " " __TIME__; -/* the space is needed cause if you build with nothing it will complain */ - /******** Local variables! ********/ /* Set to 1 after we've set everything up */ @@ -455,7 +450,7 @@ int main(int ac, char **av, char **envp) if ((i = init_primary(ac, av))) return i; - Alog(LOG_TERMINAL) << "Anope " << version_number << ", " << version_build; + Alog(LOG_TERMINAL) << "Anope " << Anope::Version() << ", " << Anope::Build(); #ifdef _WIN32 Alog(LOG_TERMINAL) << "Using configuration file " << services_dir << "\\" << services_conf; #else |