diff -urpN jumbo-bleed1/src/gost.h jumbo-bleed0/src/gost.h
--- jumbo-bleed1/src/gost.h	2012-07-03 14:54:31.750000000 +0000
+++ jumbo-bleed0/src/gost.h	2012-07-03 14:52:04.687500000 +0000
@@ -102,11 +102,11 @@ static inline uint32_t bswap_32(uint32_t
 # define bswap_32(x) _byteswap_ulong((unsigned long)x)
 #elif !defined(__STRICT_ANSI__)
 /* general bswap_32 definition.  Note, bswap_32 already defined as inline in GCC 3.4.4, but it sux. */
-static inline uint32_t __bswap_32(uint32_t x) {
+static inline uint32_t _JtR_Swap_32(uint32_t x) {
 	x = ((x << 8) & 0xFF00FF00) | ((x >> 8) & 0x00FF00FF);
 	return (x >> 16) | (x << 16);
 }
-# define bswap_32(x) __bswap_32(x)
+# define bswap_32(x) _JtR_Swap_32(x)
 #else
 #define bswap_32(x) ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
 	(((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
@@ -118,7 +118,7 @@ static inline uint32_t __bswap_32(uint32
 # define bswap_64(x) _byteswap_uint64((__int64)x)
 #elif !defined(__STRICT_ANSI__)
 /* general bswap_64 definition.  Note, bswap_64 already defined as inline in GCC 3.4.4, but it sux. */
-static inline uint64_t __bswap_64(uint64_t x) {
+static inline uint64_t _JtR_Swap_64(uint64_t x) {
 	union {
 		uint64_t ll;
 		uint32_t l[2];
@@ -128,7 +128,7 @@ static inline uint64_t __bswap_64(uint64
 	r.l[1] = bswap_32(w.l[0]);
 	return r.ll;
 }
-# define bswap_64(x) __bswap_64(x)
+# define bswap_64(x) _JtR_Swap_64(x)
 #else
 #error "bswap_64 unsupported"
 #endif