Commit 9223baf9 authored by Kevin E Martin's avatar Kevin E Martin
Browse files

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).
parent a45bc0df
......@@ -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;
......
......@@ -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"
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment