diff options
| author | Michael Adam <obnox@samba.org> | 2009-01-15 22:27:52 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2009-01-15 22:56:01 +0100 |
| commit | 39ec8791f874a0a9a853aa1497099a57c1aa1dbc (patch) | |
| tree | 33519fc91211ed6aa875c06007c6ba6bf81bf8ba /source3/lib | |
| parent | da656c2e87708daf2276ad4f091452c9ec411053 (diff) | |
| download | samba-39ec8791f874a0a9a853aa1497099a57c1aa1dbc.tar.gz samba-39ec8791f874a0a9a853aa1497099a57c1aa1dbc.tar.bz2 samba-39ec8791f874a0a9a853aa1497099a57c1aa1dbc.zip | |
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
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/fault.c | 2 | ||||
| -rw-r--r-- | source3/lib/popt_common.c | 2 | ||||
| -rw-r--r-- | source3/lib/substitute.c | 2 | ||||
| -rw-r--r-- | source3/lib/version.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/fault.c b/source3/lib/fault.c index c24fea1ca9..a1530987f3 100644 --- a/source3/lib/fault.c +++ b/source3/lib/fault.c @@ -38,7 +38,7 @@ static void fault_report(int sig) counter++; DEBUGSEP(0); - DEBUG(0,("INTERNAL ERROR: Signal %d in pid %d (%s)",sig,(int)sys_getpid(),SAMBA_VERSION_STRING)); + DEBUG(0,("INTERNAL ERROR: Signal %d in pid %d (%s)",sig,(int)sys_getpid(),samba_version_string())); DEBUG(0,("\nPlease read the Trouble-Shooting section of the Samba3-HOWTO\n")); DEBUG(0,("\nFrom: http://www.samba.org/samba/docs/Samba3-HOWTO.pdf\n")); DEBUGSEP(0); diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c index 115133089c..e14477c979 100644 --- a/source3/lib/popt_common.c +++ b/source3/lib/popt_common.c @@ -73,7 +73,7 @@ static void popt_common_callback(poptContext con, if (reason == POPT_CALLBACK_REASON_POST) { if (PrintSambaVersionString) { - printf( "Version %s\n", SAMBA_VERSION_STRING); + printf( "Version %s\n", samba_version_string()); exit(0); } diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index acfe55d761..b4f5f70fa0 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()); diff --git a/source3/lib/version.c b/source3/lib/version.c index 55fb53c5db..e81f463586 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include <assert.h> +#include "version.h" const char *samba_version_string(void) { |