From: Ramsay Jones Date: Mon, 18 Nov 2013 21:16:15 GMT Subject: Re: [PATCH v3 0/21] pack bitmaps Message-ID: <528A839F.10804@ramsay1.demon.co.uk> In-Reply-To: <52855834.3080608@ramsay1.demon.co.uk> On 14/11/13 23:09, Ramsay Jones wrote: > On 14/11/13 21:33, Jeff King wrote: >> On Thu, Nov 14, 2013 at 07:19:38PM +0000, Ramsay Jones wrote: >> >>> Unfortunately, I didn't find time this weekend to finish the msvc build >>> fixes. However, after a quick squint at these patches, I think you have >>> almost done it for me! :-D >>> >>> I must have misunderstood the previous discussion, because my patch was >>> written on the assumption that the ewah directory wouldn't be "git-ified" >>> (e.g. #include git-compat-util.h). >> >> I think it was up for debate at some point, but we did decide to go >> ahead and git-ify. Please feel free to submit further fixups if you need >> them. > > Yep, will do; at present it looks like that one-liner. Despite saying I would wait for these patches to land in pu, I applied these patches to the next branch (@ 8721652 "Sync with 1.8.5-rc2") so that I could try them out. As expected, everything was fine on Linux and cygwin, and the msvc build needed a one-liner fix. However, I didn't expect that MinGW would need the same fix! ;-) I had forgotten that "git-compat-util.h" does not include the header on MinGW (my previous patch included that header directly), so that we have to add the printf format macros directly to the compat/mingw.h header. [I assume that an earlier version of the library on MinGW did not have the and headers. We could now include that header on MinGW and move the PRIuMAX, PRId64 and PRIx64 macros to compat/msvc.h, but I didn't think it was worth the churn ... ] The one-liner is given below ... ATB, Ramsay Jones -- >8 -- Subject: [PATCH] compat/mingw.h: Fix the MinGW and msvc builds Signed-off-by: Ramsay Jones --- 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" void mingw_open_html(const char *path); #define open_html mingw_open_html -- 1.8.4