[PATCH v2] MSVC: define INLINE=__inline so simple `make MSVC=1` actually works
- From
Marat Radchenko <marat@slonopotamus.org>
- Date
- Mar 28, 2014, 07:33 UTC
- Message-ID
- <1395992031-27200-1-git-send-email-marat@slonopotamus.org>
- In-Reply-To
- <xmqqzjkbegdt.fsf@gitster.dls.corp.google.com>
Without this, xdiff/xutils.c fails to compile.
Signed-off-by: Marat Radchenko <marat@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