From: "Torsten Bögershausen" <tboegi@web.de>
To: "Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org, "Torsten Bögershausen" <tboegi@web.de>
Subject: Re: What's cooking in git.git (Oct 2013, #07; Mon, 28)
Date: Wed, 30 Oct 2013 17:51:58 +0100 [thread overview]
Message-ID: <5271392E.8020003@web.de> (raw)
In-Reply-To: <xmqqr4b5dwke.fsf@gitster.dls.corp.google.com>
On 2013-10-28 20.28, Junio C Hamano wrote:
> * jk/pack-bitmap (2013-10-28) 20 commits
There is a name clash under cygwin 1.7 (1.5 is OK)
The following "first aid hot fix" works for me:
/Torsten
$ git diff
diff --git a/compat/bswap.h b/compat/bswap.h
index ea1a9ed..8dc39be 100644
--- a/compat/bswap.h
+++ b/compat/bswap.h
@@ -64,7 +64,7 @@ static inline uint32_t git_bswap32(uint32_t x)
# if defined(__GNUC__) && defined(__GLIBC__)
# include <byteswap.h>
# else /* GNUC & GLIBC */
-static inline uint64_t bswap_64(uint64_t val)
+static inline uint64_t git_bswap_64(uint64_t val)
{
return ((val & (uint64_t)0x00000000000000ffULL) << 56)
| ((val & (uint64_t)0x000000000000ff00ULL) << 40)
@@ -76,8 +76,8 @@ static inline uint64_t bswap_64(uint64_t val)
| ((val & (uint64_t)0xff00000000000000ULL) >> 56);
}
# endif /* GNUC & GLIBC */
-# define ntohll(n) bswap_64(n)
-# define htonll(n) bswap_64(n)
+# define ntohll(n) git_bswap_64(n)
+# define htonll(n) git_bswap_64(n)
#else /* __BYTE_ORDER */
# error "Can't define htonll or ntohll!"
#endif
next prev parent reply other threads:[~2013-10-30 16:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-28 19:28 What's cooking in git.git (Oct 2013, #07; Mon, 28) Junio C Hamano
2013-10-28 21:58 ` Thomas Rast
2013-10-30 16:51 ` Torsten Bögershausen [this message]
2013-10-30 17:01 ` Vicent Martí
2013-10-30 17:14 ` Torsten Bögershausen
2013-10-30 17:39 ` Torsten Bögershausen
2013-10-30 19:11 ` Ramsay Jones
2013-10-30 19:06 ` Ramsay Jones
2013-10-30 20:30 ` Torsten Bögershausen
2013-10-30 21:07 ` Ramsay Jones
2013-10-31 13:24 ` htonll, ntohll Torsten Bögershausen
2013-11-05 0:00 ` Ramsay Jones
2013-11-06 15:58 ` Torsten Bögershausen
2013-11-12 14:44 ` Jakub Narębski
2013-11-13 12:20 ` Andreas Ericsson
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=5271392E.8020003@web.de \
--to=tboegi@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).