$NetBSD: patch-af,v 1.1 2006/06/26 10:56:57 rillig Exp $

Thou shalt not use reserved identifiers.

--- tools_c.h.orig	2004-12-13 22:54:33.000000000 +0100
+++ tools_c.h	2006-06-26 12:52:17.000000000 +0200
@@ -11,18 +11,18 @@
 #else
 # define BSWAP_16(B)\
 	({\
-			__u16 _B = (B);\
-			(((__u16) ((_B) << 8) | ((_B) >> 8)));\
+			__u16 m_B = (B);\
+			(((__u16) ((m_B) << 8) | ((m_B) >> 8)));\
 	})
 # define BSWAP_32(B)\
 	({\
-			__u32 _B = (B);\
-			(((__u32) (_B << 24) | ((_B << 8) & 0xff0000) | ((_B >> 8) & 0xff00) | (_B >> 24)));\
+			__u32 m_B = (B);\
+			(((__u32) (m_B << 24) | ((m_B << 8) & 0xff0000) | ((m_B >> 8) & 0xff00) | (m_B >> 24)));\
 	})
 # define BSWAP_64(B)\
 	({\
-			__u64 _B = (B);\
-			__u32 *_B32 = (__u32 *) &_B;\
+			__u64 m_B = (B);\
+			__u32 *_B32 = (__u32 *) &m_B;\
 			(((__u64) BSWAP32 (_B32[0])) << 32) | BSWAP32 (_B32[1]);\
 	})
 #endif
@@ -30,9 +30,9 @@
 
 #define ROTL(X,n)\
 	({\
-			__u32 _X = (X);\
-			__u32 _n = (n);\
-			((_X << _n) | (_X >> (32 - _n)));\
+			__u32 m_X = (X);\
+			__u32 m_n = (n);\
+			((m_X << m_n) | (m_X >> (32 - m_n)));\
 	})