---------------------
PatchSet 11292 
Date: 2007/03/03 18:25:31
Author: serassio
Branch: HEAD
Tag: (none) 
Log:
Fix bswap16 & bswap32 redefinition error on NetBSD

Members: 
	configure.in:1.419->1.420 
	include/ntlmauth.h:1.10->1.11 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid/squid/configure.in,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- squid/configure.in	5 Feb 2007 22:10:33 -0000	1.419
+++ squid/configure.in	3 Mar 2007 18:25:31 -0000	1.420
@@ -1,7 +1,7 @@
 dnl
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.419 2007/02/05 22:10:33 hno Exp $
+dnl  $Id: configure.in,v 1.420 2007/03/03 18:25:31 serassio Exp $
 dnl
 dnl
 dnl
@@ -10,7 +10,7 @@
 AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE
-AC_REVISION($Revision: 1.419 $)dnl
+AC_REVISION($Revision: 1.420 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -2354,8 +2354,6 @@
 	syslog \
 	timegm \
 	vsnprintf \
-	bswap_16 \
-	bswap_32 \
 )
 
 SAVED_LIBS="$LIBS"
Index: squid/include/ntlmauth.h
===================================================================
RCS file: /cvsroot/squid/squid/include/ntlmauth.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- squid/include/ntlmauth.h	17 May 2005 16:56:35 -0000	1.10
+++ squid/include/ntlmauth.h	3 Mar 2007 18:25:31 -0000	1.11
@@ -1,5 +1,5 @@
 /*
- * $Id: ntlmauth.h,v 1.10 2005/05/17 16:56:35 hno Exp $
+ * $Id: ntlmauth.h,v 1.11 2007/03/03 18:25:31 serassio Exp $
  *
  * * * * * * * * Legal stuff * * * * * * *
  *
@@ -70,10 +70,14 @@
 #define bswap16(x) bswap_16(x)
 #define bswap32(x) bswap_32(x)
 #else	 /* HAVE_BISTWAP_H */
+#ifndef bswap16
 #define bswap16(x) (((((u_int16_t)x) >> 8) & 0xff) | ((((u_int16_t)x) & 0xff) << 8))
+#endif
+#ifndef bswap32
 #define bswap32(x) \
     (((((u_int32_t)x) & 0xff000000) >> 24) | ((((u_int32_t)x) & 0x00ff0000) >>  8) | \
      ((((u_int32_t)x) & 0x0000ff00) <<  8) | ((((u_int32_t)x) & 0x000000ff) << 24))
+#endif
 #endif /* HAVE_BITSWAP_H */
 
 /* Used internally. Microsoft seems to think this is right, I believe them.