[PATCH] Fix linking for not-so-clever linkers.
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jul 10, 2006, 11:40 UTC
- Message-ID
- <Pine.LNX.4.63.0607101340080.29667@wbgn013.biozentrum.uni-wuerzburg.de>
On one of my systems, the linker is not intelligent enough to link with pager.o (in libgit.a) when only the variable pager_in_use is needed. The consequence is that the linker complains about an undefined variable. So, put the variable into environment.o, where it is linked always.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> --- environment.c | 1 + pager.c | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/environment.c b/environment.c index 43823ff..97d42b1 100644 --- a/environment.c +++ b/environment.c @@ -21,6 +21,7 @@ char git_commit_encoding[MAX_ENCODING_LE int shared_repository = PERM_UMASK; const char *apply_default_whitespace = NULL; int zlib_compression_level = Z_DEFAULT_COMPRESSION; +int pager_in_use; static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir, *git_graft_file; diff --git a/pager.c b/pager.c index bb14e99..280f57f 100644 --- a/pager.c +++ b/pager.c @@ -5,8 +5,6 @@ #include "cache.h" * something different on Windows, for example. */ -int pager_in_use; - static void run_pager(const char *pager) { execlp(pager, pager, NULL);
-- 1.4.1.g6e33b-dirty