head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.52 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.50 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.48 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.46 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.44 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.42 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.40 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.38 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.36 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.34 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.32 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.30 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.28 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.26 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.24 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.22 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.20 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.18 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.16 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.14 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.12 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.10 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.8 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.6 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.4 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1 netbsd-1-5-PATCH001:1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1; locks; strict; comment @# @; 1.2 date 2003.12.24.12.51.31; author jmmv; state dead; branches; next 1.1; 1.1 date 99.10.04.23.21.46; author simonb; state Exp; branches; next ; desc @@ 1.2 log @Update teTeX packages to 2.0.2 (really merge teTeX2 into teTeX). The 2.x branch becomes the default teTeX package. @ text @$NetBSD: patch-al,v 1.1 1999/10/04 23:21:46 simonb Exp $ --- texk/ps2pkm/regions.c.orig Fri Mar 26 07:11:59 1999 +++ texk/ps2pkm/regions.c Thu Sep 30 13:34:44 1999 @@@@ -242,7 +242,7 @@@@ register struct edgelist *next; /* loop variable */ if (area->references < 0) - abort("KillRegion: negative reference count"); + t1_abort("KillRegion: negative reference count"); if ( (--(area->references) > 1) || ( (area->references == 1) && !ISPERMANENT(area->flag) ) ) return; @@@@ -308,7 +308,7 @@@@ IfTrace2((RegionDebug),"....new edge: ymin=%d, ymax=%d ", (LONG)ymin, (LONG) ymax); if (ymin >= ymax) - abort("newedge: height not positive"); + t1_abort("newedge: height not positive"); /* We are going to copy the xvalues into a newly allocated area. It helps performance if the values are all "long" aligned. We can test @@@@ -567,7 +567,7 @@@@ break; default: - abort("Interior: path type error"); + t1_abort("Interior: path type error"); } /* We're done with this segment. Advance to the next path segment in @@@@ -633,7 +633,7 @@@@ } while (area != NULL && area->ymin == y); if (count != 0) - abort("Unwind: uneven edges"); + t1_abort("Unwind: uneven edges"); } } /* @@@@ -691,7 +691,7 @@@@ } if (ymax < ymin) - abort("negative sized edge?"); + t1_abort("negative sized edge?"); /* FIXME: there are not as much parameters as here. */ @@@@ -942,9 +942,9 @@@@ if (y < list->ymin) break; if (y >= list->ymax) - abort("splitedge: above top of list"); + t1_abort("splitedge: above top of list"); if (y == list->ymin) - abort("splitedge: would be null"); + t1_abort("splitedge: would be null"); r = (struct edgelist *)Allocate(sizeof(struct edgelist), list, 0); /* @@@@ -984,7 +984,7 @@@@ Then, we return the caller a pointer to 'new': */ if (new == NULL) - abort("null splitedge"); + t1_abort("null splitedge"); lastlist->link = NULL; last->link = list; IfTrace1((RegionDebug > 1),"yields %x\n", new); @@@@ -1006,7 +1006,7 @@@@ #endif { if (BOTTOM(top) > TOP(bottom)) - abort("vertjoin not disjoint"); + t1_abort("vertjoin not disjoint"); for (; top->link != NULL; top=top->link) { ; } @@@@ -1114,7 +1114,7 @@@@ h0 = h = edge->ymax - edge->ymin; if (h <= 0) - abort("SwathUnion: 0 height swath?"); + t1_abort("SwathUnion: 0 height swath?"); before = before0; after = before->link; @@@@ -1378,7 +1378,7 @@@@ for (p = beg; p != right; p = p->link) { if (p->link == NULL && right != NULL) - abort("discard(): ran off end"); + t1_abort("discard(): ran off end"); IfTrace1((RegionDebug > 0),"discarding %x\n", p); p->ymin = p->ymax = 32767; end = p; @@@@ -1466,7 +1466,7 @@@@ for (edge=region->anchor; VALIDEDGE(edge); edge=next) { if (edge->link == NULL) - abort("UnJumble: unpaired edge?"); + t1_abort("UnJumble: unpaired edge?"); next = edge->link->link; edge->link->link = NULL; anchor = SortSwath(anchor, edge, t1_SwathUnion); @@@@ -1504,9 +1504,9 @@@@ if (xmin != xmax || (xmin != R->xmin && xmax != R->xmax)) R->flag &= ~ISRECTANGULAR(ON); if (xmin < e->xmin || xmax > e->xmax) - abort("Tighten: existing edge bound was bad"); + t1_abort("Tighten: existing edge bound was bad"); if (xmin < R->xmin || xmax > R->xmax) - abort("Tighten: existing region bound was bad"); + t1_abort("Tighten: existing region bound was bad"); e->xmin = xmin; e->xmax = xmax; } @@@@ -1755,11 +1755,11 @@@@ int oldmin,oldmax; { if (edge->type != EDGETYPE) - abort("EDGE ERROR: non EDGETYPE in list"); + t1_abort("EDGE ERROR: non EDGETYPE in list"); /* The following check is not valid if the region is jumbled so I took it out: */ /* if (edge->ymin < oldmax && edge->ymin != oldmin) - abort("EDGE ERROR: overlapping swaths"); */ + t1_abort("EDGE ERROR: overlapping swaths"); */ } @ 1.1 log @Don't use a function called "abort" that takes one char * as a parameter. Fixes compile problems on at least pmax, arm32. @ text @d1 1 a1 1 $NetBSD$ @