Module Name: xsrc
Committed By: joerg
Date: Wed Mar 5 21:29:31 UTC 2014
Modified Files:
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/sis: sis_tritmp.h
xsrc/external/mit/libXaw/dist/src: Text.c
xsrc/external/mit/libXpm/dist/src: create.c
xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/x86emu: prim_ops.c
xsrc/external/mit/xorg-server/dist/mi: miarc.c
xsrc/external/mit/xorg-server/dist/randr: rrtransform.c
xsrc/external/mit/xtrap/dist: xtrapout.c
Log Message:
Fix abs usage.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/sis/sis_tritmp.h
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/libXaw/dist/src/Text.c
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/libXpm/dist/src/create.c
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/x86emu/prim_ops.c
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xorg-server/dist/mi/miarc.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xorg-server/dist/randr/rrtransform.c
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xtrap/dist/xtrapout.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/sis/sis_tritmp.h
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/sis/sis_tritmp.h:1.1.1.2 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/sis/sis_tritmp.h:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/sis/sis_tritmp.h:1.1.1.2 Thu Jun 11 00:50:21 2009
+++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/sis/sis_tritmp.h Wed Mar 5 21:29:31 2014
@@ -204,7 +204,7 @@ static void TAG(sis6326_draw_line_mmio)(
sisVertexPtr v1 = (sisVertexPtr)(verts + smesa->vertex_size * 4);
GLint dwPrimitiveSet = smesa->dwPrimitiveSet;
- if (abs(v0->v.y - v1->v.y) > abs(v0->v.x - v1->v.x))
+ if (fabsf(v0->v.y - v1->v.y) > fabsf(v0->v.x - v1->v.x))
{
dwPrimitiveSet |= OP_3D_DIRECTION_VERTICAL;
if (v0->v.y > v1->v.y)
Index: xsrc/external/mit/libXaw/dist/src/Text.c
diff -u xsrc/external/mit/libXaw/dist/src/Text.c:1.1.1.4 xsrc/external/mit/libXaw/dist/src/Text.c:1.2
--- xsrc/external/mit/libXaw/dist/src/Text.c:1.1.1.4 Fri May 31 00:34:37 2013
+++ xsrc/external/mit/libXaw/dist/src/Text.c Wed Mar 5 21:29:31 2014
@@ -2837,7 +2837,7 @@ DoSelection(TextWidget ctx, XawTextPosit
if (motion)
newType = ctx->text.s.type;
else {
- if ((abs((long) time - (long) ctx->text.lasttime) < MULTI_CLICK_TIME)
+ if ((labs((long) time - (long) ctx->text.lasttime) < MULTI_CLICK_TIME)
&& (pos >= ctx->text.s.left && pos <= ctx->text.s.right)) {
sarray = ctx->text.sarray;
for (; *sarray != XawselectNull && *sarray != ctx->text.s.type;
Index: xsrc/external/mit/libXpm/dist/src/create.c
diff -u xsrc/external/mit/libXpm/dist/src/create.c:1.1.1.4 xsrc/external/mit/libXpm/dist/src/create.c:1.2
--- xsrc/external/mit/libXpm/dist/src/create.c:1.1.1.4 Fri May 31 01:09:03 2013
+++ xsrc/external/mit/libXpm/dist/src/create.c Wed Mar 5 21:29:31 2014
@@ -347,10 +347,10 @@ SetCloseColor(
closenesses[i].cols_index = i;
closenesses[i].closeness =
- COLOR_FACTOR * (abs((long) col->red - (long) cols[i].red)
- + abs((long) col->green - (long) cols[i].green)
- + abs((long) col->blue - (long) cols[i].blue))
- + BRIGHTNESS_FACTOR * abs(((long) col->red +
+ COLOR_FACTOR * (labs((long) col->red - (long) cols[i].red)
+ + labs((long) col->green - (long) cols[i].green)
+ + labs((long) col->blue - (long) cols[i].blue))
+ + BRIGHTNESS_FACTOR * labs(((long) col->red +
(long) col->green +
(long) col->blue)
- ((long) cols[i].red +
Index: xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.14 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.15
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.14 Sun Jun 2 08:05:46 2013
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c Wed Mar 5 21:29:31 2014
@@ -2166,7 +2166,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int
/* Only alter the memory clock if the desired memory clock differs
* by 50kHz from the one currently being used.
*/
- if (abs(mclk - MemClk->ProbedClk) > 50) {
+ if ((mclk - MemClk->ProbedClk) > 50U) {
unsigned char vclk[3];
MemClk->Clk = mclk;
@@ -5406,7 +5406,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, Dis
ChipsNew->XR[0x80] &= ~0x80;
}
- if (abs(cPtr->MemClock.Clk - cPtr->MemClock.ProbedClk) > 50) {
+ if ((cPtr->MemClock.Clk - cPtr->MemClock.ProbedClk) > 50U) {
/* set mem clk */
ChipsNew->XR[0xCC] = cPtr->MemClock.xrCC;
ChipsNew->XR[0xCD] = cPtr->MemClock.xrCD;
@@ -6278,7 +6278,7 @@ chipsModeInit655xx(ScrnInfoPtr pScrn, Di
* better will be used.
*/
- if (ChipsNew->XR[0x2C] < abs((cPtr->PanelSize.VTotal -
+ if ((unsigned)ChipsNew->XR[0x2C] < ((cPtr->PanelSize.VTotal -
cPtr->PanelSize.VRetraceStart - tmp - 1) -
ChipsNew->XR[0x2C]))
ChipsNew->XR[0x2F] |= 0x80; /* turn FLM delay off */
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/x86emu/prim_ops.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/x86emu/prim_ops.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/x86emu/prim_ops.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/x86emu/prim_ops.c:1.1.1.2 Thu Jun 11 01:52:57 2009
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/x86emu/prim_ops.c Wed Mar 5 21:29:31 2014
@@ -2350,7 +2350,7 @@ void div_byte(u8 s)
}
div = dvd / (u8)s;
mod = dvd % (u8)s;
- if (abs(div) > 0xff) {
+ if (div > 0xff) {
x86emu_intr_raise(0);
return;
}
@@ -2373,7 +2373,7 @@ void div_word(u16 s)
}
div = dvd / (u16)s;
mod = dvd % (u16)s;
- if (abs(div) > 0xffff) {
+ if (div > 0xffff) {
x86emu_intr_raise(0);
return;
}
Index: xsrc/external/mit/xorg-server/dist/mi/miarc.c
diff -u xsrc/external/mit/xorg-server/dist/mi/miarc.c:1.1.1.3 xsrc/external/mit/xorg-server/dist/mi/miarc.c:1.2
--- xsrc/external/mit/xorg-server/dist/mi/miarc.c:1.1.1.3 Tue Nov 23 05:22:05 2010
+++ xsrc/external/mit/xorg-server/dist/mi/miarc.c Wed Mar 5 21:29:31 2014
@@ -1591,7 +1591,7 @@ miGetArcPts(
x1 = x2; y1 = y2;
}
/* adjust the last point */
- if (abs(parc->angle2) >= 360.0)
+ if (fabs(parc->angle2) >= 360.0)
poly[cpt +i -1] = poly[0];
else {
poly[cpt +i -1].x = (miDcos(st + et) * parc->width/2.0 + xc);
Index: xsrc/external/mit/xorg-server/dist/randr/rrtransform.c
diff -u xsrc/external/mit/xorg-server/dist/randr/rrtransform.c:1.1.1.3 xsrc/external/mit/xorg-server/dist/randr/rrtransform.c:1.2
--- xsrc/external/mit/xorg-server/dist/randr/rrtransform.c:1.1.1.3 Tue Nov 23 05:22:12 2010
+++ xsrc/external/mit/xorg-server/dist/randr/rrtransform.c Wed Mar 5 21:29:31 2014
@@ -126,7 +126,7 @@ RRTransformRescale(struct pixman_f_trans
for (j = 0; j < 3; j++)
for (i = 0; i < 3; i++)
- if ((v = abs (f_transform->m[j][i])) > max)
+ if ((v = fabs (f_transform->m[j][i])) > max)
max = v;
scale = limit / max;
for (j = 0; j < 3; j++)
Index: xsrc/external/mit/xtrap/dist/xtrapout.c
diff -u xsrc/external/mit/xtrap/dist/xtrapout.c:1.1.1.1 xsrc/external/mit/xtrap/dist/xtrapout.c:1.2
--- xsrc/external/mit/xtrap/dist/xtrapout.c:1.1.1.1 Wed Jul 30 04:39:39 2008
+++ xsrc/external/mit/xtrap/dist/xtrapout.c Wed Mar 5 21:29:31 2014
@@ -88,6 +88,7 @@ SOFTWARE.
**--
*/
+#include <inttypes.h>
#include <stdio.h>
#include <X11/extensions/xtraplib.h>
#include <X11/extensions/xtraplibp.h>
@@ -147,7 +148,7 @@ static void print_evt_callback(XETC *tc,
static Time last_time = 0;
int delta;
- delta = abs((int)last_time ? data->u.event.u.keyButtonPointer.time -
+ delta = imaxabs((int)last_time ? (intmax_t)data->u.event.u.keyButtonPointer.time -
(int)last_time : (int)last_time);
last_time = data->u.event.u.keyButtonPointer.time;
