Without this, xdiff/xutils.c fails to compile.

Signed-off-by: Marat Radchenko <ma...@slonopotamus.org>
---

I thought about removing #define inline __inline from compat/msvc.h but:

 * compat/msvc.h is included based on #if defined(_MSC_VER)
   and can be enabled even if MSVC != 1
 * compat/msvc.h also has #define __inline__ __inline and I don't see
   a nice way to handle both of them in config.mak.uname

 config.mak.uname | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config.mak.uname b/config.mak.uname
index 6c7b904..38c60af 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -355,6 +355,7 @@ ifeq ($(uname_S),Windows)
        NO_POSIX_GOODIES = UnfortunatelyYes
        NATIVE_CRLF = YesPlease
        DEFAULT_HELP_FORMAT = html
+       INLINE = __inline
 
        CC = compat/vcbuild/scripts/clink.pl
        AR = compat/vcbuild/scripts/lib.pl
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to