diff options
| author | Alan Hourihane <alanh@vmware.com> | 2009-01-22 09:43:42 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@vmware.com> | 2009-01-22 09:43:42 +0000 |
| commit | 4df482086ebf0663c708b089d8d8d22de0ef972c (patch) | |
| tree | e802cc36b266bfdeb80ab9e55643c50f5a5e6d9c /src/mesa/drivers/dri/intel/intel_screen.h | |
| parent | 01cbd764962ff49bf104e5997914ced53360ef81 (diff) | |
| parent | b8bd0b0ddc357f9b430bb6ddeb60c5a2179d3791 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
windows/VC8/mesa/osmesa/osmesa.vcproj
windows/VC8/progs/demos/gears.vcproj
windows/VC8/progs/progs.sln
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_screen.h')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_screen.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_screen.h b/src/mesa/drivers/dri/intel/intel_screen.h index cf5359baae..fcd0d9c28c 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.h +++ b/src/mesa/drivers/dri/intel/intel_screen.h @@ -68,7 +68,7 @@ typedef struct __DRIscreenPrivate *driScrnPriv; - volatile struct drm_i915_sarea *sarea; + volatile drm_i915_sarea_t *sarea; int drmMinor; @@ -94,7 +94,7 @@ extern void intelUnmapScreenRegions(intelScreenPrivate * intelScreen); extern void intelUpdateScreenFromSAREA(intelScreenPrivate * intelScreen, - struct drm_i915_sarea * sarea); + drm_i915_sarea_t * sarea); extern void intelDestroyContext(__DRIcontextPrivate * driContextPriv); |