Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGE

1 files changed, 6 insertions, 6 deletions

diff --git a/src/ffb_drishare.h b/src/ffb_drishare.h
index 4cb8588..c439129 100644
--- a/src/ffb_drishare.h
+++ b/src/ffb_drishare.h
@@ -16,26 +16,26 @@ typedef struct ffb_dri_state {
 } ffb_dri_state_t;
 
 #define FFB_DRISHARE(SAREA)	\
-	((ffb_dri_state_t *) (((char *)(SAREA)) + sizeof(XF86DRISAREARec)))
+	((ffb_dri_state_t *) (((char *)(SAREA)) + sizeof(drm_sarea_t)))
 
 typedef struct {
-	drmHandle	hFbcRegs;
+	drm_handle_t	hFbcRegs;
 	drmSize		sFbcRegs;
 	drmAddress	mFbcRegs;
 
-	drmHandle	hDacRegs;
+	drm_handle_t	hDacRegs;
 	drmSize		sDacRegs;
 	drmAddress	mDacRegs;
 
-	drmHandle	hSfb8r;
+	drm_handle_t	hSfb8r;
 	drmSize		sSfb8r;
 	drmAddress	mSfb8r;
 
-	drmHandle	hSfb32;
+	drm_handle_t	hSfb32;
 	drmSize		sSfb32;
 	drmAddress	mSfb32;
 
-	drmHandle	hSfb64;
+	drm_handle_t	hSfb64;
 	drmSize		sSfb64;
 	drmAddress	mSfb64;