From c20583b1296dcfd4cdf9da9cdf073357070466b7 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sat, 8 Nov 2008 04:14:55 +0300 Subject: [PATCH] [6802] Fixed build of realmd (absent macro arg) after recent git_id adding. --- contrib/git_id/.gitignore | 19 +++++++++++++++++++ src/realmd/Main.cpp | 3 ++- src/shared/revision_nr.h | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 contrib/git_id/.gitignore diff --git a/contrib/git_id/.gitignore b/contrib/git_id/.gitignore new file mode 100644 index 0000000..a7a9e65 --- /dev/null +++ b/contrib/git_id/.gitignore @@ -0,0 +1,19 @@ +# +# NOTE! Don't add files that are generated in specific +# subdirectories here. Add them in the ".gitignore" file +# in that subdirectory instead. +# +# NOTE! Please use 'git-ls-files -i --exclude-standard' +# command after changing this file, to see if there are +# any tracked files which get ignored after the change. +# +# Extractor generated files at Windows build +# + +*.bsc +*.ncb +*.pdb +*.suo +Debug +Release +*.user diff --git a/src/realmd/Main.cpp b/src/realmd/Main.cpp index 52624d5..0d691cd 100644 --- a/src/realmd/Main.cpp +++ b/src/realmd/Main.cpp @@ -30,6 +30,7 @@ #include "AuthSocket.h" #include "SystemConfig.h" #include "revision.h" +#include "revision_nr.h" #include "Util.h" #ifdef WIN32 @@ -150,7 +151,7 @@ extern int main(int argc, char **argv) while (pause > clock()) {} } - sLog.outString( "%s [realm-daemon]", _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_ID) ); + sLog.outString( "%s [realm-daemon]", _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_NR,REVISION_ID) ); sLog.outString( " to stop.\n" ); /// realmd PID file creation diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index afc7e5b..652ec33 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "6801" + #define REVISION_NR "6802" #endif // __REVISION_NR_H__ -- 2.11.4.GIT