44 lines
1.3 KiB
Text
44 lines
1.3 KiB
Text
$NetBSD: patch-ag,v 1.1 2006/06/26 10:56:57 rillig Exp $
|
|
|
|
Thou shalt not use reserved identifiers.
|
|
|
|
--- tplx.c.orig 2004-12-27 16:57:42.000000000 +0100
|
|
+++ tplx.c 2006-06-26 12:50:49.000000000 +0200
|
|
@@ -37,13 +37,13 @@
|
|
|
|
# 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)));\
|
|
})
|
|
|
|
#ifdef LIL_ENDIAN
|
|
@@ -135,15 +135,15 @@ inline __u32 color_unpack_rgb565 (__u32
|
|
|
|
inline __u32 color_unpack_rgba4 (__u32 X)
|
|
{
|
|
- __u32 _X = X;
|
|
+ __u32 m_X = X;
|
|
|
|
|
|
#ifdef LIL_ENDIAN
|
|
- _X = ((X & 0x0f00) << 0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12);
|
|
+ m_X = ((X & 0x0f00) << 0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12);
|
|
#else
|
|
- _X = ((X & 0x0f00) << 8) | ((X & 0x00f0) << 4) | ((X & 0x000f) << 0) | ((X & 0xf000) << 12);
|
|
+ m_X = ((X & 0x0f00) << 8) | ((X & 0x00f0) << 4) | ((X & 0x000f) << 0) | ((X & 0xf000) << 12);
|
|
#endif
|
|
- return (_X | (_X << 4));
|
|
+ return (m_X | (m_X << 4));
|
|
}
|
|
|
|
|