diff options
| author | tv <tv@pkgsrc.org> | 2000-10-07 02:03:24 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2000-10-07 02:03:24 +0000 |
| commit | d018ed3708a5fa2a78cc74b2e004e4bf67f05801 (patch) | |
| tree | 30b8badcb675fc16660a20a15763e82251ee88fd /textproc | |
| parent | d5b8bb9657643d17bb4d53b9c9d833b3ad21a474 (diff) | |
| download | pkgsrc-d018ed3708a5fa2a78cc74b2e004e4bf67f05801.tar.gz | |
Add fix for alpha; explicitly instantiate Vector<size_t>, as size_t is
"unsigned long" on alpha. Nuke instantiation of Vector<unsigned int>
and finish the halfassed LP64 fix that's already here by changing a
Vector<unsigned int> to Vector<size_t> in the code.
NOT TESTED but appears to fix the problem for alpha; tested not to cause
problems on i386.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/sp/patches/patch-ab | 13 | ||||
| -rw-r--r-- | textproc/sp/patches/patch-ac | 15 | ||||
| -rw-r--r-- | textproc/sp/patches/patch-ad | 33 |
3 files changed, 61 insertions, 0 deletions
diff --git a/textproc/sp/patches/patch-ab b/textproc/sp/patches/patch-ab new file mode 100644 index 00000000000..ae6eb905a51 --- /dev/null +++ b/textproc/sp/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2000/10/07 02:03:24 tv Exp $ + +--- include/SearchResultMessageArg.h.orig Fri Oct 6 21:34:14 2000 ++++ include/SearchResultMessageArg.h Fri Oct 6 21:34:40 2000 +@@ -29,7 +29,7 @@ + int errnum(size_t) const; + private: + Vector<StringC> filename_; +- Vector<unsigned int> errno_; ++ Vector<size_t> errno_; + }; + + inline diff --git a/textproc/sp/patches/patch-ac b/textproc/sp/patches/patch-ac new file mode 100644 index 00000000000..8024a8e0db0 --- /dev/null +++ b/textproc/sp/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1 2000/10/07 02:03:24 tv Exp $ + +--- lib/parser_inst.m4.orig Fri Oct 6 21:36:27 2000 ++++ lib/parser_inst.m4 Fri Oct 6 21:36:32 2000 +@@ -164,10 +164,7 @@ + __instantiate(Vector<ContentModelAmbiguity>) + __instantiate(Vector<Transition>) + __instantiate(Vector<LeafContentToken*>) +-#if 0 + __instantiate(Vector<size_t>) +-#endif +-__instantiate(Vector<unsigned int>) + + __instantiate(NamedTable<Id>) + __instantiate(NamedTableIter<Id>) diff --git a/textproc/sp/patches/patch-ad b/textproc/sp/patches/patch-ad new file mode 100644 index 00000000000..0257b299940 --- /dev/null +++ b/textproc/sp/patches/patch-ad @@ -0,0 +1,33 @@ +$NetBSD: patch-ad,v 1.1 2000/10/07 02:03:25 tv Exp $ + +--- lib/parser_inst.cxx.orig Fri Oct 6 21:35:11 2000 ++++ lib/parser_inst.cxx Fri Oct 6 21:35:46 2000 +@@ -1324,7 +1324,6 @@ + #endif + #endif + #endif +-#if 0 + #ifdef __DECCXX + #pragma define_template Vector<size_t> + #else +@@ -1335,20 +1334,6 @@ + template class Vector<size_t>; + #else + typedef Vector<size_t> Dummy_96; +-#endif +-#endif +-#endif +-#endif +-#ifdef __DECCXX +-#pragma define_template Vector<unsigned int> +-#else +-#ifdef __xlC__ +-#pragma define(Vector<unsigned int>) +-#else +-#ifdef SP_ANSI_CLASS_INST +-template class Vector<unsigned int>; +-#else +-typedef Vector<unsigned int> Dummy_97; + #endif + #endif + #endif |