[dovecot-cvs] dovecot/src/lib-otp otp-hash.c,1.1,1.2

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-otp
In directory talvi:/tmp/cvs-serv17705

Modified Files:
	otp-hash.c 
Log Message:
s/swab/swab_uint32/. swab() already exists in libc and it may conflict.



Index: otp-hash.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-otp/otp-hash.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- otp-hash.c	12 Nov 2006 19:36:41 -0000	1.1
+++ otp-hash.c	27 Dec 2006 07:59:56 -0000	1.2
@@ -53,7 +53,7 @@
 /*
  * Sometimes I simply can't look at code generated by gcc.
  */
-static inline uint32_t swab(uint32_t val)
+static inline uint32_t swab_uint32(uint32_t val)
 {
 #if defined(__GNUC__) && defined(__i386__)
 	asm("xchgb %b0, %h0\n"
@@ -74,8 +74,8 @@
 
 	sha1_result(ctx, tmp);
 
-	*p++ = swab(tmp[0] ^ tmp[2] ^ tmp[4]);
-	*p = swab(tmp[1] ^ tmp[3]);
+	*p++ = swab_uint32(tmp[0] ^ tmp[2] ^ tmp[4]);
+	*p = swab_uint32(tmp[1] ^ tmp[3]);
 }