diff options
| author | idr <idr> | 2004-06-03 01:18:18 +0000 |
|---|---|---|
| committer | idr <idr> | 2004-06-03 01:18:18 +0000 |
| commit | 175a700de38b3e7e90ae14c8ab17722b80347ce5 (patch) | |
| tree | 97baf918674f4198cfc97cad49cdff4b8a12c6bb | |
| parent | 4ef2f40e4f7ff41a1d3f60ee99fdb19bdd25b95d (diff) | |
Minor build fixes now that drm_sarea.h is used instead of sarea.h.
| -rw-r--r-- | xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc | 3 | ||||
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_drishare.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc b/xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc index 29aedf478..cf21b1168 100644 --- a/xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc +++ b/xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc @@ -26,7 +26,8 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -I$(XF86OSSRC) \ -I$(XF86COMSRC) \ -I$(GLXLIBSRC)/dri/drm \ - -I$(GLXLIBSRC)/include + -I$(GLXLIBSRC)/include \ + -I$(DRMSRCDIR)/shared #endif COMMON_MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ diff --git a/xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_drishare.h b/xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_drishare.h index 1c983d005..f023920a1 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_drishare.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_drishare.h @@ -16,7 +16,7 @@ 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 { drm_handle_t hFbcRegs; |