summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2008-09-14 11:46:36 +0200
committerMichel Dänzer <michel@tungstengraphics.com>2008-09-30 11:36:27 +0200
commit3110646daf05fa09faaa70066cc8c3db1bb07cec (patch)
tree00c7dec78dd2b02af9a1db405d4502def983a2b5
parentd82f2938f69402c641a1c8362fdc513419b27659 (diff)
Fix -Werror build.
-rw-r--r--src/radeon_driver.c2
-rw-r--r--src/radeon_drm.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 42b6d0cd..67f70cb5 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5519,7 +5519,7 @@ void RADEONLeaveVT(int scrnIndex, int flags)
if (info->dri->textureSize) {
drm_radeon_sarea_t *pSAREAPriv =
(drm_radeon_sarea_t*)DRIGetSAREAPrivate(pScrn->pScreen);
- drmTextureRegionPtr list = pSAREAPriv->tex_list[0];
+ struct drm_tex_region *list = pSAREAPriv->tex_list[0];
int age = ++pSAREAPriv->tex_age[0];
i = 0;
diff --git a/src/radeon_drm.h b/src/radeon_drm.h
index c0d566cd..66cefb7c 100644
--- a/src/radeon_drm.h
+++ b/src/radeon_drm.h
@@ -543,8 +543,9 @@ typedef struct drm_radeon_init {
unsigned int depth_bpp;
unsigned int depth_offset, depth_pitch;
- unsigned long fb_offset DEPRECATED; /* deprecated, driver asks hardware */
- unsigned long mmio_offset DEPRECATED; /* deprecated, driver asks hardware */
+ /* DEPRECATED commented out below to allow for -Werror build */
+ unsigned long fb_offset /*DEPRECATED*/; /* deprecated, driver asks hardware */
+ unsigned long mmio_offset /*DEPRECATED*/; /* deprecated, driver asks hardware */
unsigned long ring_offset;
unsigned long ring_rptr_offset;
unsigned long buffers_offset;