All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marat Radchenko <marat@slonopotamus.org>
To: git@vger.kernel.org
Cc: Marat Radchenko <marat@slonopotamus.org>
Subject: [PATCH v2] MSVC: define INLINE=__inline so simple `make MSVC=1` actually works
Date: Fri, 28 Mar 2014 11:33:51 +0400	[thread overview]
Message-ID: <1395992031-27200-1-git-send-email-marat@slonopotamus.org> (raw)
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

      parent reply	other threads:[~2014-03-28  7:34 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-27  7:34 [PATCH] MSVC: allow enabling CURL Marat Radchenko
2014-03-27  7:34 ` [PATCH] MSVC: added missing include so `make INLINE=__inline` is no longer required Marat Radchenko
2014-03-27 16:49   ` Junio C Hamano
2014-03-27 17:43     ` [PATCH] MSVC: added missing include so `makeINLINE=__inline` " Marat Radchenko
2014-03-28  7:33     ` Marat Radchenko [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1395992031-27200-1-git-send-email-marat@slonopotamus.org \
    --to=marat@slonopotamus.org \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.