Re: What's cooking in git.git (Oct 2013, #07; Mon, 28)

["Torsten Bögershausen" <tboegi@web.de>]

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