---------------------
PatchSet 11330 
Date: 2007/03/13 02:09:59
Author: hno
Branch: SQUID_2_6
Tag: (none) 
Log:
Author: serassio

MFC: Fix bswap16 & bswap32 redefinition error on NetBSD

Members: 
	ChangeLog:1.604.2.9->1.604.2.10 
	configure.in:1.416.2.5->1.416.2.6 
	include/ntlmauth.h:1.10->1.10.2.1 

Index: squid/ChangeLog
===================================================================
RCS file: /cvsroot/squid/squid/ChangeLog,v
retrieving revision 1.604.2.9
retrieving revision 1.604.2.10
diff -u -r1.604.2.9 -r1.604.2.10
--- squid/ChangeLog	12 Mar 2007 22:52:40 -0000	1.604.2.9
+++ squid/ChangeLog	13 Mar 2007 02:09:59 -0000	1.604.2.10
@@ -7,6 +7,7 @@
 	- Make sure the child worker process commits suicide if it could
 	  not start up
 	- Don't log short responses at debug level 1
+	- Fix bswap16 & bwsap32 error on NetBSD
 
 Changes to squid-2.6.STABLE10 (Mar  4 2007)
 
Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid/squid/configure.in,v
retrieving revision 1.416.2.5
retrieving revision 1.416.2.6
diff -u -r1.416.2.5 -r1.416.2.6
--- squid/configure.in	3 Mar 2007 21:53:31 -0000	1.416.2.5
+++ squid/configure.in	13 Mar 2007 02:12:39 -0000	1.416.2.6
@@ -1,7 +1,7 @@
 dnl
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.416.2.5 2007/03/03 21:53:31 hno Exp $
+dnl  $Id: configure.in,v 1.416.2.6 2007/03/13 02:12:39 hno 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.416.2.5 $)dnl
+AC_REVISION($Revision: 1.416.2.6 $)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.10.2.1
diff -u -r1.10 -r1.10.2.1
--- squid/include/ntlmauth.h	17 May 2005 16:56:35 -0000	1.10
+++ squid/include/ntlmauth.h	13 Mar 2007 02:12:39 -0000	1.10.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: ntlmauth.h,v 1.10 2005/05/17 16:56:35 hno Exp $
+ * $Id: ntlmauth.h,v 1.10.2.1 2007/03/13 02:12:39 hno 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.