From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Tue, 23 Nov 2010 17:18:38 +0000 (-0500)
Subject: rxkad: rename bswap32 to octetswap32
X-Git-Tag: upstream/1.8.0_pre1^2~4467
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=467b0fadf75df73593c85b45bf15d8e51bd8ae23;p=packages%2Fo%2Fopenafs.git

rxkad: rename bswap32 to octetswap32

In bg-fcrypt.c the bswap32 macro has a name conflict with roken.
Rename it to octetswap32.

Change-Id: I1466c2abb4883c8856962b232859e49014a04796
Reviewed-on: http://gerrit.openafs.org/3361
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/rxkad/bg-fcrypt.c b/src/rxkad/bg-fcrypt.c
index 92e3814e1..687c267a4 100644
--- a/src/rxkad/bg-fcrypt.c
+++ b/src/rxkad/bg-fcrypt.c
@@ -99,12 +99,12 @@
 
 /* Rotate 32 bit word left */
 #define ROT32L(x, n) ((((afs_uint32) x) << (n)) | (((afs_uint32) x) >> (32-(n))))
-#define bswap32(x) (((ROT32L(x, 16) & 0x00ff00ff)<<8) | ((ROT32L(x, 16)>>8) & 0x00ff00ff))
+#define octetswap32(x) (((ROT32L(x, 16) & 0x00ff00ff)<<8) | ((ROT32L(x, 16)>>8) & 0x00ff00ff))
 
 #if WORDS_BIGENDIAN
 #define NTOH(x) (x)
 #else
-#define NTOH(x) bswap32(x)
+#define NTOH(x) octetswap32(x)
 #endif
 
 /*