* [PATCH] MSVC: allow enabling CURL
@ 2014-03-27 7:34 Marat Radchenko
2014-03-27 7:34 ` [PATCH] MSVC: added missing include so `make INLINE=__inline` is no longer required Marat Radchenko
0 siblings, 1 reply; 5+ messages in thread
From: Marat Radchenko @ 2014-03-27 7:34 UTC (permalink / raw)
To: git; +Cc: Marat Radchenko
Signed-off-by: Marat Radchenko <marat@slonopotamus.org>
---
compat/vcbuild/scripts/clink.pl | 2 ++
config.mak.uname | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index 4374771..a87d0da 100755
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -33,6 +33,8 @@ while (@ARGV) {
push(@args, "libeay32.lib");
} elsif ("$arg" eq "-lssl") {
push(@args, "ssleay32.lib");
+ } elsif ("$arg" eq "-lcurl") {
+ push(@args, "libcurl.lib");
} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
$arg =~ s/^-L/-LIBPATH:/;
push(@args, $arg);
diff --git a/config.mak.uname b/config.mak.uname
index 6069a44..cfc2a93 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -340,7 +340,6 @@ ifeq ($(uname_S),Windows)
UNRELIABLE_FSTAT = UnfortunatelyYes
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
NO_REGEX = YesPlease
- NO_CURL = YesPlease
NO_GETTEXT = YesPlease
NO_PYTHON = YesPlease
BLK_SHA1 = YesPlease
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] MSVC: added missing include so `make INLINE=__inline` is no longer required
2014-03-27 7:34 [PATCH] MSVC: allow enabling CURL Marat Radchenko
@ 2014-03-27 7:34 ` Marat Radchenko
2014-03-27 16:49 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Marat Radchenko @ 2014-03-27 7:34 UTC (permalink / raw)
To: git; +Cc: Marat Radchenko
Signed-off-by: Marat Radchenko <marat@slonopotamus.org>
---
xdiff/xutils.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 62cb23d..a21a835 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -23,6 +23,7 @@
#include <limits.h>
#include <assert.h>
#include "xinclude.h"
+#include "git-compat-util.h"
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] MSVC: added missing include so `make INLINE=__inline` is no longer required
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 ` [PATCH v2] MSVC: define INLINE=__inline so simple `make MSVC=1` actually works Marat Radchenko
0 siblings, 2 replies; 5+ messages in thread
From: Junio C Hamano @ 2014-03-27 16:49 UTC (permalink / raw)
To: Marat Radchenko; +Cc: git
Marat Radchenko <marat@slonopotamus.org> writes:
> Signed-off-by: Marat Radchenko <marat@slonopotamus.org>
> ---
> xdiff/xutils.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/xdiff/xutils.c b/xdiff/xutils.c
> index 62cb23d..a21a835 100644
> --- a/xdiff/xutils.c
> +++ b/xdiff/xutils.c
> @@ -23,6 +23,7 @@
> #include <limits.h>
> #include <assert.h>
> #include "xinclude.h"
> +#include "git-compat-util.h"
This is unfortunate for a few reasons:
- xdiff/* is a borrowed code; we do not want to have (or add more)
dependencies on the rest of Git, including compat-util.
- When a piece of our code needs our compatibility support,
compat-util must be the first header file included (either
directly, or indirectly by including another header file that
includes it at the top).
My gut feeling is that adding a mechanism to add -DINLINE=__inline
only on MSVC to the top-level Makefile, without touching this file,
may be a much more palatable.
I dunno.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] MSVC: added missing include so `makeINLINE=__inline` is no longer required
2014-03-27 16:49 ` Junio C Hamano
@ 2014-03-27 17:43 ` Marat Radchenko
2014-03-28 7:33 ` [PATCH v2] MSVC: define INLINE=__inline so simple `make MSVC=1` actually works Marat Radchenko
1 sibling, 0 replies; 5+ messages in thread
From: Marat Radchenko @ 2014-03-27 17:43 UTC (permalink / raw)
To: git
Junio C Hamano <gitster <at> pobox.com> writes:
> My gut feeling is that adding a mechanism to add -DINLINE=__inline
> only on MSVC to the top-level Makefile, without touching this file,
> may be a much more palatable.
Okay, I'll think more about this one. Maybe *moving* inline=__inline from
compat-headers into Makefile (actually, config.mak.uname) will work better.
Hope it doesn't prevent first patch from being integrated -- joining them in a
single thread was unintentional misuse of `git send-email` flags.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] MSVC: define INLINE=__inline so simple `make MSVC=1` actually works
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
1 sibling, 0 replies; 5+ messages in thread
From: Marat Radchenko @ 2014-03-28 7:33 UTC (permalink / raw)
To: git; +Cc: Marat Radchenko
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-03-28 7:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH v2] MSVC: define INLINE=__inline so simple `make MSVC=1` actually works Marat Radchenko
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.