From 39ec8791f874a0a9a853aa1497099a57c1aa1dbc Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 15 Jan 2009 22:27:52 +0100 Subject: s3: make better use of ccache by not including version.h in every C-file. version.h changes rather frequently. Since it is included via includes.h, this means each C file will be a cache miss. This applies to the following situations: * When building a new package with a new Samba version * building in a git branch after calling mkversion.sh after a new commit (i.e. virtually always) This patch improves the situation in the following way: * remove inlude "version.h" from includes.h * Use samba_version_string() instead of SAMBA_VERSION_STRING in files that use no other macro from version.h instead of SAMBA_VERSION_STRING. * explicitly include "version.h" in those files that use more macros from "version.h" than just SAMBA_VERSION_STRING. Michael --- source3/lib/substitute.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/substitute.c') diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index acfe55d7617..b4f5f70fa05 100644 --- a/source3/lib/substitute.c +++ b/source3/lib/substitute.c @@ -659,7 +659,7 @@ char *alloc_sub_basic(const char *smb_name, const char *domain_name, : ""); break; case 'v' : - a_string = realloc_string_sub(a_string, "%v", SAMBA_VERSION_STRING); + a_string = realloc_string_sub(a_string, "%v", samba_version_string()); break; case 'w' : a_string = realloc_string_sub(a_string, "%w", lp_winbind_separator()); -- cgit