# HG changeset patch # User Matt Harbison # Date 1520194602 18000 # Node ID 1f9bbd1d6b8ae4f7ea5d9f4310269a3b0242e7b0 # Parent 6bacb2f663cb07f58bb493db5f21ae321d5a2e06 xdiff: fix builds on Windows This works on my ancient Fedora system too, without warnings. There are, however, warnings about various 64 to 32 bit conversions on Windows that need to be examined. diff -r 6bacb2f663cb -r 1f9bbd1d6b8a mercurial/thirdparty/xdiff/xdiffi.c --- a/mercurial/thirdparty/xdiff/xdiffi.c Mon Mar 05 01:08:40 2018 +0530 +++ b/mercurial/thirdparty/xdiff/xdiffi.c Sun Mar 04 15:16:42 2018 -0500 @@ -30,6 +30,10 @@ #define XDL_SNAKE_CNT 20 #define XDL_K_HEUR 4 +/* VC 2008 doesn't know about the inline keyword. */ +#if defined(_MSC_VER) +#define inline __forceinline +#endif typedef struct s_xdpsplit { diff -r 6bacb2f663cb -r 1f9bbd1d6b8a mercurial/thirdparty/xdiff/xinclude.h --- a/mercurial/thirdparty/xdiff/xinclude.h Mon Mar 05 01:08:40 2018 +0530 +++ b/mercurial/thirdparty/xdiff/xinclude.h Sun Mar 04 15:16:42 2018 -0500 @@ -26,7 +26,6 @@ #include #include #include -#include #include #include