frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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).
This commit is contained in:
Kevin E Martin 2004-08-18 18:41:41 +00:00
parent a45bc0df7a
commit 9223baf985
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xprint/ps/PsPixmap.c
View File

@ -79,7 +79,7 @@ in this Software without prior written authorization from The Open Group.
#include "Ps.h" #include "Ps.h"
#define BitsPerPixel(d) (\ #define _BitsPerPixel(d) (\
(1 << PixmapWidthPaddingInfo[d].padBytesLog2) * 8 / \ (1 << PixmapWidthPaddingInfo[d].padBytesLog2) * 8 / \
(PixmapWidthPaddingInfo[d].padRoundUp+1)) (PixmapWidthPaddingInfo[d].padRoundUp+1))
@ -98,7 +98,7 @@ PsCreatePixmap(
pPixmap->drawable.class = 0; pPixmap->drawable.class = 0;
pPixmap->drawable.pScreen = pScreen; pPixmap->drawable.pScreen = pScreen;
pPixmap->drawable.depth = depth; pPixmap->drawable.depth = depth;
pPixmap->drawable.bitsPerPixel = BitsPerPixel(depth); pPixmap->drawable.bitsPerPixel = _BitsPerPixel(depth);
pPixmap->drawable.id = 0; pPixmap->drawable.id = 0;
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pPixmap->drawable.x = 0; pPixmap->drawable.x = 0;

3
hw/xfree86/common/xf86Init.c
View File

@ -1747,8 +1747,7 @@ xf86PrintBanner()
#if PRE_RELEASE #if PRE_RELEASE
ErrorF("\n" ErrorF("\n"
"This is a pre-release version of the " XVENDORNAME " X11.\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" "It is not supported in any way.\n"
"files from XFree86 4.4RC3. It is not supported in any way.\n"
"Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\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" "Select the \"xorg\" product for bugs you find in this release.\n"
"Before reporting bugs in pre-release versions please check the\n" "Before reporting bugs in pre-release versions please check the\n"

4
render/renderedge.c
View File

@ -44,7 +44,7 @@ RenderSampleCeilY (xFixed y, int n)
return (i | f); 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 * 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 f = xFixedFrac(y);
xFixed i = xFixedFloor (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)) if (f < Y_FRAC_FIRST(n))
{ {
f = Y_FRAC_LAST(n); f = Y_FRAC_LAST(n);