From f9843c7a35975b178eec9812d21e1f02a2120928 Mon Sep 17 00:00:00 2001 From: Zhigang Gong Date: Fri, 8 Apr 2011 14:53:15 +0800 Subject: [PATCH] glamor: Fixed one conflict data type(XID) bug. We should include the dix-config.h for all the glamor files. Otherwise the XID type maybe inconsisitent in different files in 64bit machine. The root cause is this macro "#define _XSERVER64 1" should be included in all files refer to the data type "XID" which is originally defined in X.h. If _XSERVER64 is defined as 1, then XID is defined as CARD32 which is a 32bit integer. If _XSERVER64 is not defined as 1 then XID is "unsigned long". In a 32bit machine, "unsigned long" should be identical to CARD32. But in a 64bit machine, they are different. --- glamor/glamor_priv.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 3dc3a5389..18bd76b12 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -24,10 +24,14 @@ * Eric Anholt * */ - #ifndef GLAMOR_PRIV_H #define GLAMOR_PRIV_H +#ifdef HAVE_DIX_CONFIG_H +#include +#endif + + #include "glamor.h" #include