From f6748c3f743db3ab094040204f8ba6ae2410a66b Mon Sep 17 00:00:00 2001 From: simonb Date: Mon, 4 Oct 1999 23:21:44 +0000 Subject: Don't use a function called "abort" that takes one char * as a parameter. Fixes compile problems on at least pmax, arm32. --- print/teTeX-bin/patches/patch-af | 22 +++++++ print/teTeX-bin/patches/patch-ag | 13 ++++ print/teTeX-bin/patches/patch-ah | 98 +++++++++++++++++++++++++++++ print/teTeX-bin/patches/patch-ai | 92 +++++++++++++++++++++++++++ print/teTeX-bin/patches/patch-aj | 12 ++++ print/teTeX-bin/patches/patch-ak | 49 +++++++++++++++ print/teTeX-bin/patches/patch-al | 132 +++++++++++++++++++++++++++++++++++++++ print/teTeX-bin/patches/patch-am | 40 ++++++++++++ print/teTeX-bin/patches/patch-an | 13 ++++ print/teTeX-bin/patches/patch-ao | 18 ++++++ 10 files changed, 489 insertions(+) create mode 100644 print/teTeX-bin/patches/patch-af create mode 100644 print/teTeX-bin/patches/patch-ag create mode 100644 print/teTeX-bin/patches/patch-ah create mode 100644 print/teTeX-bin/patches/patch-ai create mode 100644 print/teTeX-bin/patches/patch-aj create mode 100644 print/teTeX-bin/patches/patch-ak create mode 100644 print/teTeX-bin/patches/patch-al create mode 100644 print/teTeX-bin/patches/patch-am create mode 100644 print/teTeX-bin/patches/patch-an create mode 100644 print/teTeX-bin/patches/patch-ao (limited to 'print') diff --git a/print/teTeX-bin/patches/patch-af b/print/teTeX-bin/patches/patch-af new file mode 100644 index 00000000000..de3a54b3b9d --- /dev/null +++ b/print/teTeX-bin/patches/patch-af @@ -0,0 +1,22 @@ +$NetBSD: patch-af,v 1.1 1999/10/04 23:21:44 simonb Exp $ + +--- texk/ps2pkm/arith.c.orig Sat Jan 24 23:11:27 1998 ++++ texk/ps2pkm/arith.c Thu Sep 30 13:33:46 1999 +@@ -203,7 +203,7 @@ + divisor >>= 1; + + if ((u1u2 >> (LONGSIZE - shift)) != 0 && shift != 0) +- abort("DLdiv: dividend too large"); ++ t1_abort("DLdiv: dividend too large"); + u1u2 = (u1u2 << shift) + ((shift == 0) ? 0 : u3u4 >> (LONGSIZE - shift)); + u3u4 <<= shift; + +@@ -266,7 +266,7 @@ + */ + u1u2 = t; + if (HIGHDIGIT(u1u2) != 0) +- abort("divide algorithm error"); ++ t1_abort("divide algorithm error"); + u1u2 = ASSEMBLE(u1u2, LOWDIGIT(u3)); + u3 = LOWDIGIT(u3u4); + q3q4 = ASSEMBLE(q3q4, qhat); diff --git a/print/teTeX-bin/patches/patch-ag b/print/teTeX-bin/patches/patch-ag new file mode 100644 index 00000000000..f616449ffeb --- /dev/null +++ b/print/teTeX-bin/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1 1999/10/04 23:21:44 simonb Exp $ + +--- texk/ps2pkm/curves.c.orig Wed Jan 28 20:44:07 1998 ++++ texk/ps2pkm/curves.c Thu Sep 30 13:33:49 1999 +@@ -213,7 +213,7 @@ + + if ( TOOBIG(xB) || TOOBIG(yB) || TOOBIG(xC) || TOOBIG(yC) + || TOOBIG(xD) || TOOBIG(yD) ) +- abort("Beziers this big not yet supported"); ++ t1_abort("Beziers this big not yet supported"); + + return(StepBezierRecurse(&Info, + (fractpel) 0, (fractpel) 0, xB, yB, xC, yC, xD, yD)); diff --git a/print/teTeX-bin/patches/patch-ah b/print/teTeX-bin/patches/patch-ah new file mode 100644 index 00000000000..5320d2e3808 --- /dev/null +++ b/print/teTeX-bin/patches/patch-ah @@ -0,0 +1,98 @@ +$NetBSD: patch-ah,v 1.1 1999/10/04 23:21:45 simonb Exp $ + +--- texk/ps2pkm/hints.c.orig Sat Jan 24 23:11:28 1998 ++++ texk/ps2pkm/hints.c Thu Sep 30 13:34:00 1999 +@@ -167,7 +167,7 @@ + } + else /* error */ + { +- abort("ComputeHint: invalid orientation"); ++ t1_abort("ComputeHint: invalid orientation"); + } + + IfTrace4((HintDebug > 1), +@@ -201,7 +201,7 @@ + } + else /* error */ + { +- abort("ComputeHint: invalid hinttype"); ++ t1_abort("ComputeHint: invalid hinttype"); + } + + IfTrace1((HintDebug > 1)," hintValue=%p", hintValue); +@@ -218,7 +218,7 @@ + } + else /* error */ + { +- abort("ComputeHint: invalid orientation"); ++ t1_abort("ComputeHint: invalid orientation"); + } + } + +@@ -267,7 +267,7 @@ + } + else /* error */ + { +- abort("ProcessHint: invalid label"); ++ t1_abort("ProcessHint: invalid label"); + } + } + else if (hP->adjusttype == 'r') /* Reverse */ +@@ -283,18 +283,18 @@ + } + else /* error */ + { +- abort("ProcessHint: label is not in use"); ++ t1_abort("ProcessHint: label is not in use"); + } + } + else /* error */ + { +- abort("ProcessHint: invalid label"); ++ t1_abort("ProcessHint: invalid label"); + } + + } + else /* error */ + { +- abort("ProcessHint: invalid adjusttype"); ++ t1_abort("ProcessHint: invalid adjusttype"); + } + IfTrace3((HintDebug > 1)," label=%d, thisHint=(%p,%p)\n", + hP->label, thisHint.x, thisHint.y); +@@ -386,7 +386,7 @@ + else + return(XofY(edge, y)); + +- abort("bad subpath chain"); ++ t1_abort("bad subpath chain"); + /*NOTREACHED*/ + } + /* +@@ -467,7 +467,7 @@ + else if (ISBOTTOM(e1->flag) && y == e1->ymax) + return(!ISDOWN(e2->flag)); + else +- abort("ImpliedHorizontalLine: why ask?"); ++ t1_abort("ImpliedHorizontalLine: why ask?"); + /*NOTREACHED*/ + } + +@@ -506,7 +506,7 @@ + if (!ISBREAK(edge, next)) + continue; + if (edge->ymax < next->ymin) +- abort("disjoint subpath?"); ++ t1_abort("disjoint subpath?"); + /* + 'edge' now contains an edgelist at the bottom of an edge, and 'next' + contains the next subsequent edgelist in the subpath, which must be at +@@ -567,7 +567,7 @@ + + break1->subpath = break2->subpath; + if (ISBREAK(break1, break1->subpath)) +- abort("unable to fix subpath break?"); ++ t1_abort("unable to fix subpath break?"); + + break2->subpath = next; + diff --git a/print/teTeX-bin/patches/patch-ai b/print/teTeX-bin/patches/patch-ai new file mode 100644 index 00000000000..b07b84eee2d --- /dev/null +++ b/print/teTeX-bin/patches/patch-ai @@ -0,0 +1,92 @@ +$NetBSD: patch-ai,v 1.1 1999/10/04 23:21:45 simonb Exp $ + +--- texk/ps2pkm/objects.c.orig Tue Feb 24 22:54:33 1998 ++++ texk/ps2pkm/objects.c Thu Sep 30 13:34:16 1999 +@@ -300,14 +300,14 @@ + size = (size + sizeof(LONG) - 1) & -sizeof(LONG); + extra = (extra + sizeof(LONG) - 1) & -sizeof(LONG); + if (size + extra <= 0) +- abort("Non-positive allocate?"); ++ t1_abort("Non-positive allocate?"); + r = (struct xobject *) Xalloc(size + extra); + + while (r == NULL) { + if (!GimeSpace()) { + IfTrace1(TRUE, "malloc attempted %d bytes.\n", + size + extra); +- abort("We have REALLY run out of memory"); ++ t1_abort("We have REALLY run out of memory"); + } + r = (struct xobject *) Xalloc(size + extra); + } +@@ -358,7 +358,7 @@ + register struct xobject *obj; /* structure to free */ + { + if (obj->type == INVALIDTYPE) +- abort("Free of already freed object?"); ++ t1_abort("Free of already freed object?"); + obj->type = INVALIDTYPE; + + if (MemoryDebug > 1) { +@@ -777,7 +777,7 @@ + char name[NAMESIZE]; /* buffer to store my copy of 'username' */ + + if (strlen(username) >= NAMESIZE) +- abort("Pragmatics name too large"); ++ t1_abort("Pragmatics name too large"); + strcpy(name, username); + for (p = name; *p != '\0'; p++) + *p = toupper(*p); +@@ -941,7 +941,7 @@ + return; + + default: +- abort("Consume: too many objects"); ++ t1_abort("Consume: too many objects"); + } + } + #endif /* WIN32 */ +@@ -967,7 +967,7 @@ + ObjectPostMortem(obj); + + if (MustCrash) +- abort("Terminating because of CrashOnUserError..."); ++ t1_abort("Terminating because of CrashOnUserError..."); + else + ErrorMessage = typemsg; + +@@ -1062,14 +1062,14 @@ + if (obj != NULL) + ObjectPostMortem(obj); + if (MustCrash) +- abort("Terminating because of CrashOnUserError..."); ++ t1_abort("Terminating because of CrashOnUserError..."); + else + ErrorMessage = str; + return(ret); + } + + /* +-:h3.abort() - Crash Due to Error ++:h3.t1_abort() - Crash Due to Error + + We divide by zero, and if that doesn't work, call exit(), the results of + which is system dependent (and thus is part of the Hourglass required +@@ -1078,7 +1078,7 @@ + static int test = 0; + + /*ARGSUSED*/ +-void abort(str) ++void t1_abort(str) + char *str; + { + LineIOTrace = TRUE; +@@ -1120,7 +1120,7 @@ + /* All other calls to malloc are defined to Xalloc. */ + + if (sizeof(SHORT) != 2 || sizeof(LONG) != 4) +- abort("Fundamental TYPE1IMAGER assumptions invalid in this port"); ++ t1_abort("Fundamental TYPE1IMAGER assumptions invalid in this port"); + InitSpaces(); + InitFonts(); + InitFiles(); diff --git a/print/teTeX-bin/patches/patch-aj b/print/teTeX-bin/patches/patch-aj new file mode 100644 index 00000000000..9cee947b212 --- /dev/null +++ b/print/teTeX-bin/patches/patch-aj @@ -0,0 +1,12 @@ +$NetBSD: patch-aj,v 1.1 1999/10/04 23:21:45 simonb Exp $ + +--- texk/ps2pkm/objects.h.orig Tue Mar 16 18:16:08 1999 ++++ texk/ps2pkm/objects.h Thu Sep 30 13:35:40 1999 +@@ -61,7 +61,6 @@ + /*END SHARED*/ + /*SHARED*/ + +-#define abort(line) t1_abort(line) + #define Allocate(n,t,s) t1_Allocate(n,t,s) + #define Free(obj) t1_Free(obj) + #define NonObjectFree(a) Xfree(a) diff --git a/print/teTeX-bin/patches/patch-ak b/print/teTeX-bin/patches/patch-ak new file mode 100644 index 00000000000..ba85af45ab8 --- /dev/null +++ b/print/teTeX-bin/patches/patch-ak @@ -0,0 +1,49 @@ +$NetBSD: patch-ak,v 1.1 1999/10/04 23:21:46 simonb Exp $ + +--- texk/ps2pkm/paths.c.orig Sat Jan 24 23:11:28 1998 ++++ texk/ps2pkm/paths.c Thu Sep 30 13:34:23 1999 +@@ -798,7 +798,7 @@ + break; + + default: +- abort("Reverse: bad path segment"); ++ t1_abort("Reverse: bad path segment"); + } + /* + We need to reverse the order of segments too, so we break this segment +@@ -932,7 +932,7 @@ + for (p=p0; p->link->link != NULL; p=p->link) { ; } + + if (!LASTCLOSED(p->link->flag)) +- abort("UnClose: no LASTCLOSED"); ++ t1_abort("UnClose: no LASTCLOSED"); + + Free(SplitPath(p0, p)); + p0->flag &= ~ISCLOSED(ON); +@@ -1033,7 +1033,7 @@ + + default: + IfTrace1(TRUE,"path = %z\n", p); +- abort("PathTransform: invalid segment"); ++ t1_abort("PathTransform: invalid segment"); + } + oldx += savex; + oldy += savey; +@@ -1185,7 +1185,7 @@ + break; + + default: +- abort("QueryPath: unknown segment"); ++ t1_abort("QueryPath: unknown segment"); + } + if (coerced) + KillPath(path); +@@ -1325,7 +1325,7 @@ + case HINTTYPE: + break; + default: +- abort("QueryBounds: unknown type"); ++ t1_abort("QueryBounds: unknown type"); + } + + if (x < min.x) min.x = x; diff --git a/print/teTeX-bin/patches/patch-al b/print/teTeX-bin/patches/patch-al new file mode 100644 index 00000000000..ca2a867ca92 --- /dev/null +++ b/print/teTeX-bin/patches/patch-al @@ -0,0 +1,132 @@ +$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"); */ + } diff --git a/print/teTeX-bin/patches/patch-am b/print/teTeX-bin/patches/patch-am new file mode 100644 index 00000000000..b472dd001e5 --- /dev/null +++ b/print/teTeX-bin/patches/patch-am @@ -0,0 +1,40 @@ +$NetBSD: patch-am,v 1.1 1999/10/04 23:21:47 simonb Exp $ + +--- texk/ps2pkm/spaces.c.orig Sun Feb 7 09:00:18 1999 ++++ texk/ps2pkm/spaces.c Thu Sep 30 13:34:51 1999 +@@ -207,7 +207,7 @@ + int rc = -1; /* return code for QueryDeviceState */ + + if (rc != 0) /* we only bother with this check once */ +- abort("Context: QueryDeviceState didn't work"); ++ t1_abort("Context: QueryDeviceState didn't work"); + + M[0][0] = M[1][0] = M[0][1] = M[1][1] = 0.0; + +@@ -225,7 +225,7 @@ + M[1][0] = -Yres; M[0][1] = -Xres; + break; + default: +- abort("QueryDeviceState returned invalid orientation"); ++ t1_abort("QueryDeviceState returned invalid orientation"); + } + return(FindContext(M)); + } +@@ -249,7 +249,7 @@ + + if (i >= nextcontext) { + if (i >= MAXCONTEXTS) +- abort("Context: out of them"); ++ t1_abort("Context: out of them"); + LONGCOPY(contexts[i].normal, M, sizeof(contexts[i].normal)); + MatrixInvert(M, contexts[i].inverse); + nextcontext++; +@@ -886,7 +886,7 @@ + + D = M[1][1] * M[0][0] - M[1][0] * M[0][1]; + if (D == 0.0) +- abort("MatrixInvert: can't"); ++ t1_abort("MatrixInvert: can't"); + + Mprime[0][0] = tyy / D; + Mprime[1][0] = -txy / D; diff --git a/print/teTeX-bin/patches/patch-an b/print/teTeX-bin/patches/patch-an new file mode 100644 index 00000000000..5f68bbb2e60 --- /dev/null +++ b/print/teTeX-bin/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.1 1999/10/04 23:21:47 simonb Exp $ + +--- texk/ps2pkm/t1funcs.c.orig Fri Mar 26 07:13:10 1999 ++++ texk/ps2pkm/t1funcs.c Thu Sep 30 13:34:55 1999 +@@ -506,7 +506,7 @@ + break; + } + default: +- abort("xiFill: unknown format"); ++ t1_abort("xiFill: unknown format"); + } + } + diff --git a/print/teTeX-bin/patches/patch-ao b/print/teTeX-bin/patches/patch-ao new file mode 100644 index 00000000000..7ac78e75a8b --- /dev/null +++ b/print/teTeX-bin/patches/patch-ao @@ -0,0 +1,18 @@ +$NetBSD: patch-ao,v 1.1 1999/10/04 23:21:48 simonb Exp $ + +--- texk/ps2pkm/t1stub.c.orig Sat Jan 24 23:11:28 1998 ++++ texk/ps2pkm/t1stub.c Thu Sep 30 13:35:07 1999 +@@ -28,12 +28,10 @@ + * SOFTWARE. + */ + +-#include "objects.h" /* get #define for abort() */ +- + xiStub() + { + printf("xiStub called\n"); +- abort("xiStub called"); ++ t1_abort("xiStub called"); + } + + #ifdef WIN32 -- cgit v1.2.3