aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Forster <octo@verplant.org>2006-06-18 17:18:06 +0200
committerJunio C Hamano <junkio@cox.net>2006-06-18 21:19:10 -0700
commit04f086071e780d921f6dac83b5ffc21c3a2d7bb6 (patch)
tree98938c8fdcf7f629defb0339695d4e66309239d6
parentb4b1550315c6184ea50936be305a4f1c78ad16a8 (diff)
downloadgit-04f086071e780d921f6dac83b5ffc21c3a2d7bb6.tar.gz
git-04f086071e780d921f6dac83b5ffc21c3a2d7bb6.tar.xz
Cast pointers to `void *' when used in a format.
ANSI C99 requires void-pointers when using the `%p' format. This patch adds the neccessary cast in `blame.c'. Signed-off-by: Florian Forster <octo@verplant.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--blame.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/blame.c b/blame.c
index 7c0b62cf3..c86e2fd4b 100644
--- a/blame.c
+++ b/blame.c
@@ -301,9 +301,9 @@ static void fill_line_map(struct commit *commit, struct commit *other,
if (DEBUG)
printf("map: i1: %d %d %p i2: %d %d %p\n",
i1, map[i1],
- i1 != -1 ? blame_lines[map[i1]] : NULL,
+ (void *) (i1 != -1 ? blame_lines[map[i1]] : NULL),
i2, map2[i2],
- i2 != -1 ? blame_lines[map2[i2]] : NULL);
+ (void *) (i2 != -1 ? blame_lines[map2[i2]] : NULL));
if (map2[i2] != -1 &&
blame_lines[map[i1]] &&
!blame_lines[map2[i2]])