diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:29:01 +0000 |
| commit | adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch) | |
| tree | 23eb7becc5360b2cbe16aa8d45529880067f3989 /fb/fb.h | |
| parent | 90f1536dd315cd265bfc7ef35058761a65a01734 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'fb/fb.h')
| -rw-r--r-- | fb/fb.h | 21 |
1 files changed, 11 insertions, 10 deletions
@@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.35 2003/01/30 21:46:30 tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.37 2003/11/03 05:11:00 tsi Exp $ * * Copyright © 1998 Keith Packard * @@ -105,7 +105,8 @@ typedef unsigned __int64 FbBits; defined(ia64) || defined(__ia64__) || \ defined(__sparc64__) || \ defined(__s390x__) || \ - defined(x86_64) || defined (__x86_64__) + defined(AMD64) || defined (__AMD64__) || \ + (defined(sgi) && (_MIPS_SZLONG == 64)) typedef unsigned long FbBits; # else typedef unsigned long long FbBits; @@ -652,10 +653,10 @@ typedef struct { else \ _pPix = (PixmapPtr) (pDrawable); \ (pointer) = (FbBits *) _pPix->devPrivate.ptr; \ - (stride) = ((int) _pPix->devKind) / sizeof (FbBits); \ - (bpp) = _pPix->drawable.bitsPerPixel; \ - (xoff) = __fbPixOriginX(_pPix); \ - (yoff) = __fbPixOriginY(_pPix); \ + (stride) = ((int) _pPix->devKind) / sizeof (FbBits); (void)(stride); \ + (bpp) = _pPix->drawable.bitsPerPixel; (void)(bpp); \ + (xoff) = __fbPixOriginX(_pPix); (void)(xoff); \ + (yoff) = __fbPixOriginY(_pPix); (void)(yoff); \ } #define fbGetStipDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { \ @@ -665,10 +666,10 @@ typedef struct { else \ _pPix = (PixmapPtr) (pDrawable); \ (pointer) = (FbStip *) _pPix->devPrivate.ptr; \ - (stride) = ((int) _pPix->devKind) / sizeof (FbStip); \ - (bpp) = _pPix->drawable.bitsPerPixel; \ - (xoff) = __fbPixOriginX(_pPix); \ - (yoff) = __fbPixOriginY(_pPix); \ + (stride) = ((int) _pPix->devKind) / sizeof (FbStip); (void)(stride); \ + (bpp) = _pPix->drawable.bitsPerPixel; (void)(bpp); \ + (xoff) = __fbPixOriginX(_pPix); (void)(xoff); \ + (yoff) = __fbPixOriginY(_pPix); (void)(yoff); \ } /* |