[PATCH 01/10] fb: Modernize the FbBits typedef for FB_SHIFT == 6

Mark Kettenis mark.kettenis at xs4all.nl
Mon Mar 10 08:38:20 PDT 2014


> From: Adam Jackson <ajax at redhat.com>
> Date: Mon, 10 Mar 2014 11:04:25 -0400
> 
> Signed-off-by: Adam Jackson <ajax at redhat.com>

Not immediately obvious to me how you get <stdint.h>.  Perhaps you
should explicitly include it?

> ---
>  fb/fb.h | 15 +--------------
>  1 file changed, 1 insertion(+), 14 deletions(-)
> 
> diff --git a/fb/fb.h b/fb/fb.h
> index 9057767..f63aa4f 100644
> --- a/fb/fb.h
> +++ b/fb/fb.h
> @@ -106,20 +106,7 @@ error FB_SHIFT must be >= LOG2_BITMAP_PAD
>  #define FbBitsStrideToStipStride(s) (((s) << (FB_SHIFT - FB_STIP_SHIFT)))
>  #define FbFullMask(n)   ((n) == FB_UNIT ? FB_ALLONES : ((((FbBits) 1) << n) - 1))
>  #if FB_SHIFT == 6
> -#ifdef WIN32
> -typedef unsigned __int64 FbBits;
> -#else
> -#if defined(__alpha__) || defined(__alpha) || \
> -      defined(ia64) || defined(__ia64__) || \
> -      defined(__sparc64__) || defined(_LP64) || \
> -      defined(__s390x__) || \
> -      defined(amd64) || defined (__amd64__) || \
> -      defined (__powerpc64__)
> -typedef unsigned long FbBits;
> -#else
> -typedef unsigned long long FbBits;
> -#endif
> -#endif
> +typedef uint64_t FbBits;
>  #endif
>  
>  #if FB_SHIFT == 5
> -- 
> 1.8.5.3


More information about the xorg-devel mailing list