Re: [PATCH v4 23/23] compat/mingw.h: Fix the MinGW and msvc builds

[Jeff King <peff@peff.net>]

On Wed, Dec 25, 2013 at 11:08:57PM +0100, Erik Faye-Lund wrote:

> On Sat, Dec 21, 2013 at 3:00 PM, Jeff King <peff@peff.net> wrote:
> > From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
> >
> > Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
> > Signed-off-by: Junio C Hamano <gitster@pobox.com>
> > Signed-off-by: Jeff King <peff@peff.net>
> > ---
> >  compat/mingw.h | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/compat/mingw.h b/compat/mingw.h
> > index 92cd728..8828ede 100644
> > --- a/compat/mingw.h
> > +++ b/compat/mingw.h
> > @@ -345,6 +345,7 @@ static inline char *mingw_find_last_dir_sep(const char *path)
> >  #define PATH_SEP ';'
> >  #define PRIuMAX "I64u"
> >  #define PRId64 "I64d"
> > +#define PRIx64 "I64x"
> >
> 
> Please, move this before patch #8, and adjust the commit message.

Yeah, that makes sense. Though I think we can do one better and simply
remove the need for it entirely. The only use of PRIx64 is in a
debugging function that does not get called.

How about squashing the patch below into patch 8 ("ewah: compressed
bitmap implementation"):

diff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c
index f104b87..9ced2da 100644
--- a/ewah/ewah_bitmap.c
+++ b/ewah/ewah_bitmap.c
@@ -381,18 +381,6 @@ void ewah_iterator_init(struct ewah_iterator *it, struct ewah_bitmap *parent)
 		read_new_rlw(it);
 }
 
-void ewah_dump(struct ewah_bitmap *self)
-{
-	size_t i;
-	fprintf(stderr, "%"PRIuMAX" bits | %"PRIuMAX" words | ",
-		(uintmax_t)self->bit_size, (uintmax_t)self->buffer_size);
-
-	for (i = 0; i < self->buffer_size; ++i)
-		fprintf(stderr, "%016"PRIx64" ", (uint64_t)self->buffer[i]);
-
-	fprintf(stderr, "\n");
-}
-
 void ewah_not(struct ewah_bitmap *self)
 {
 	size_t pointer = 0;
diff --git a/ewah/ewok.h b/ewah/ewok.h
index 619afaa..43adeb5 100644
--- a/ewah/ewok.h
+++ b/ewah/ewok.h
@@ -193,8 +193,6 @@ void ewah_and(
 	struct ewah_bitmap *ewah_j,
 	struct ewah_bitmap *out);
 
-void ewah_dump(struct ewah_bitmap *self);
-
 /**
  * Direct word access
  */