diff options
author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-07-10 15:40:44 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-07-11 01:48:56 +0400 |
commit | b75a82b75402c9462cfd2e9891d2fbe7ce6239f4 (patch) | |
tree | d70c0a06b34591346ed15c0603bd05e1f06f94cd | |
parent | f443455a5bb1f274dc7a14f09bbbcb931f4388a2 (diff) |
Fix linking for not-so-clever linkers.
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>
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r-- | environment.c | 1 | ||||
-rw-r--r-- | pager.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/environment.c b/environment.c index 43823ff7d6..97d42b172b 100644 --- a/environment.c +++ b/environment.c @@ -21,6 +21,7 @@ char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8"; 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; @@ -5,8 +5,6 @@ * something different on Windows, for example. */ -int pager_in_use; - static void run_pager(const char *pager) { execlp(pager, pager, NULL); |