diff options
| author | Kevin E Martin <kem@kem.org> | 2004-08-18 18:41:41 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2004-08-18 18:41:41 +0000 |
| commit | 9223baf985778c536ce93846c431b46a0192cf32 (patch) | |
| tree | 9bbd1c7b37f20da7cf48c213ee48eb3c2c5aff3e | |
| parent | a45bc0df7a1c369e8429e84414ac813187c90059 (diff) | |
Fix AIX build problems (Bugs #1020, 1102, 1103, Dan McNichol).
Remove old config files (Bug #1123, Jim Gettys).
Remove old log message (Bug #1123, Jim Gettys).
| -rw-r--r-- | Xprint/ps/PsPixmap.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 3 | ||||
| -rw-r--r-- | render/renderedge.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/Xprint/ps/PsPixmap.c b/Xprint/ps/PsPixmap.c index 2c3e43245..616c2dbe8 100644 --- a/Xprint/ps/PsPixmap.c +++ b/Xprint/ps/PsPixmap.c @@ -79,7 +79,7 @@ in this Software without prior written authorization from The Open Group. #include "Ps.h" -#define BitsPerPixel(d) (\ +#define _BitsPerPixel(d) (\ (1 << PixmapWidthPaddingInfo[d].padBytesLog2) * 8 / \ (PixmapWidthPaddingInfo[d].padRoundUp+1)) @@ -98,7 +98,7 @@ PsCreatePixmap( pPixmap->drawable.class = 0; pPixmap->drawable.pScreen = pScreen; pPixmap->drawable.depth = depth; - pPixmap->drawable.bitsPerPixel = BitsPerPixel(depth); + pPixmap->drawable.bitsPerPixel = _BitsPerPixel(depth); pPixmap->drawable.id = 0; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pPixmap->drawable.x = 0; diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 0e81c5805..b929c5100 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1747,8 +1747,7 @@ xf86PrintBanner() #if PRE_RELEASE ErrorF("\n" "This is a pre-release version of the " XVENDORNAME " X11.\n" - "Portions of this release are based on XFree86 4.4RC2 and selected\n" - "files from XFree86 4.4RC3. It is not supported in any way.\n" + "It is not supported in any way.\n" "Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n" "Select the \"xorg\" product for bugs you find in this release.\n" "Before reporting bugs in pre-release versions please check the\n" diff --git a/render/renderedge.c b/render/renderedge.c index f9518b671..b84eec14d 100644 --- a/render/renderedge.c +++ b/render/renderedge.c @@ -44,7 +44,7 @@ RenderSampleCeilY (xFixed y, int n) return (i | f); } -#define div(a,b) ((a) >= 0 ? (a) / (b) : -((-(a) + (b) - 1) / (b))) +#define _div(a,b) ((a) >= 0 ? (a) / (b) : -((-(a) + (b) - 1) / (b))) /* * Compute the largest value no greater than y which is on a @@ -56,7 +56,7 @@ RenderSampleFloorY (xFixed y, int n) xFixed f = xFixedFrac(y); xFixed i = xFixedFloor (y); - f = div(f - Y_FRAC_FIRST(n), STEP_Y_SMALL(n)) * STEP_Y_SMALL(n) + Y_FRAC_FIRST(n); + f = _div(f - Y_FRAC_FIRST(n), STEP_Y_SMALL(n)) * STEP_Y_SMALL(n) + Y_FRAC_FIRST(n); if (f < Y_FRAC_FIRST(n)) { f = Y_FRAC_LAST(n); |