diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-01-08 20:18:13 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-01-08 20:18:13 +0000 |
| commit | 6d8001f4688e2149fcdd480401c46c7540680576 (patch) | |
| tree | 52a5be7c2679ad4148359f015fabf50516cba7c4 | |
| parent | 1be4b2d5e8048eb3653fad3a1267a0da865bcee8 (diff) | |
Compile fixes for non-DRI case and for non-C99 compiler.
| -rw-r--r-- | hw/kdrive/ati/ati_draw.c | 5 | ||||
| -rw-r--r-- | hw/kdrive/ati/radeon_composite.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/hw/kdrive/ati/ati_draw.c b/hw/kdrive/ati/ati_draw.c index 250d1b337..27c60df9f 100644 --- a/hw/kdrive/ati/ati_draw.c +++ b/hw/kdrive/ati/ati_draw.c @@ -378,6 +378,8 @@ RadeonSwitchTo3D(void) ADVANCE_RING(); } +#endif /* USE_DRI */ + static Bool ATIUploadToScreen(PixmapPtr pDst, char *src, int src_pitch) { @@ -424,9 +426,6 @@ ATIUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst) return ATIUploadToScreen(pDst, pSrc->devPrivate.ptr, pSrc->devKind); } - -#endif /* USE_DRI */ - static Bool R128GetDatatypePict(CARD32 format, CARD32 *type) { diff --git a/hw/kdrive/ati/radeon_composite.c b/hw/kdrive/ati/radeon_composite.c index a6a909f2f..7dc368dbd 100644 --- a/hw/kdrive/ati/radeon_composite.c +++ b/hw/kdrive/ati/radeon_composite.c @@ -34,8 +34,8 @@ #include "ati_sarea.h" #define TAG(x) x##DMA -#define LOCALS (void)atic; \ - RING_LOCALS +#define LOCALS RING_LOCALS; \ + (void)atic; #define BEGIN(x) BEGIN_RING(x * 2) #define OUT_REG(reg, val) OUT_RING_REG(reg, val) #define END() ADVANCE_RING() @@ -322,8 +322,8 @@ RadeonComposite(int srcX, int srcY, int maskX, int maskY, int dstX, int dstY, { ATIScreenInfo *atis = accel_atis; ATICardInfo *atic = atis->atic; - LOCALS; struct blend_vertex vtx[4]; + LOCALS; /*ErrorF("RadeonComposite %d %d %d %d %d %d\n", srcX, srcY, maskX, maskY, dstX, dstY, w, h);*/ |