From 5fc5820cbc0faf57a48154466b4792294841a690 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Wed, 16 Mar 2011 09:15:30 +0000 Subject: [PATCH] mesa: Use typecast in BITFIELD64_BIT macro. Unsigned long is 32bit on several platforms (e.g., Windows), yielding 1UL << 32 to be zero. Note that BITFIELD64_BIT result is often assigned to variables of type GLbitfield, instead of GLbitfield64. That's probably wrong and should be addressed in a later change. --- src/mesa/main/mtypes.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 95a7988d7e4..831774fa4b1 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -85,11 +85,7 @@ typedef GLuint64 GLbitfield64; /** Set a single bit */ -#ifdef __cplusplus -#define BITFIELD64_BIT(b) (1UL << (b)) -#else -#define BITFIELD64_BIT(b) (1ULL << (b)) -#endif +#define BITFIELD64_BIT(b) ((GLbitfield64)1 << (b)) /** -- 2.30.2