Fix build error under 4-current and new egcs/C++ compiler.

PR:		ports/16024
Submitted by:	MIHIRA Yoshiro <sanpei@sanpei.org>

38 files changed, 967 insertions, 12 deletions

diff --git a/japanese/iv/files/patch-aa b/japanese/iv/files/patch-aa
index bcd21e89061e..96341aee9226 100644
--- a/japanese/iv/files/patch-aa
+++ b/japanese/iv/files/patch-aa
@@ -242,18 +242,22 @@
 --- src/bin/ibuild/ibcmds.c	Sat Sep 11 09:52:51 1999
 ***************
 *** 86,92 ****
---- 86,94 ----
+--- 86,98 ----
   #undef FileChooser
   #define FileChooser _lib_iv(FileChooser)
   
 + #if __FreeBSD_cc_version < 400002
   #include <osfcn.h>
 + #endif
++ #if __FreeBSD_cc_version >= 400003
++ #include <unistd.h>
++ #endif
++ 
   #include <stdio.h>
   #include <stdlib.h>
   #include <stream.h>
 ***************
-*** 2407,2415 ****
+*** 2407,2421 ****
   	EditorInfo* installed = (EditorInfo*) toolsdialog.Installed();
           EditorInfo* removed = (EditorInfo*) toolsdialog.Removed();
   
@@ -263,7 +267,13 @@
   	    ToolPanel* itoolpanel = iEd->GetToolPanel();
   
               for (int i = 0; i < installed->Count(); i++) {
---- 2409,2417 ----
+                  itoolpanel->Install(installed->GetName(i));
+              }
+!             for (i = 0; i < removed->Count(); i++) {
+                  itoolpanel->Uninstall(removed->GetName(i));
+              }
+              itoolpanel->Change();
+--- 2413,2427 ----
   	EditorInfo* installed = (EditorInfo*) toolsdialog.Installed();
           EditorInfo* removed = (EditorInfo*) toolsdialog.Removed();
   
@@ -273,3 +283,9 @@
   	    ToolPanel* itoolpanel = iEd->GetToolPanel();
   
               for (int i = 0; i < installed->Count(); i++) {
+                  itoolpanel->Install(installed->GetName(i));
+              }
+!             for (int i = 0; i < removed->Count(); i++) {
+                  itoolpanel->Uninstall(removed->GetName(i));
+              }
+              itoolpanel->Change();
diff --git a/japanese/iv/files/patch-ad b/japanese/iv/files/patch-ad
index fe3a32318a8b..6fc41679c0c8 100644
--- a/japanese/iv/files/patch-ad
+++ b/japanese/iv/files/patch-ad
@@ -910,6 +910,24 @@ diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/IV-2_6/xpaint
   
   PainterRep::PainterRep() {
       display = Session::instance()->default_display();
+***************
+*** 1231,1237 ****
+  	return;
+      }
+      register XPoint* v = AllocPts(n+1);
+!     for (register int i = 0; i < n; i++) {
+  	Map(c, x[i], y[i], v[i].x, v[i].y);
+      }
+      if (x[i-1] != x[0] || y[i-1] != y[0]) {
+--- 1232,1239 ----
+  	return;
+      }
+      register XPoint* v = AllocPts(n+1);
+!     register int i;
+!     for (i = 0; i < n; i++) {
+  	Map(c, x[i], y[i], v[i].x, v[i].y);
+      }
+      if (x[i-1] != x[0] || y[i-1] != y[0]) {
 diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/TIFF/prototypes.h ./src/lib/TIFF/prototypes.h
 *** work-orig/iv/src/lib/TIFF/prototypes.h	Wed May 31 08:52:12 1995
 --- ./src/lib/TIFF/prototypes.h	Sun May 28 14:21:04 1995
diff --git a/japanese/iv/files/patch-af b/japanese/iv/files/patch-af
index 2e8a47a6a3dd..832602bfa7d8 100644
--- a/japanese/iv/files/patch-af
+++ b/japanese/iv/files/patch-af
@@ -1,5 +1,5 @@
 *** src/lib/InterViews/style.c.orig	Wed Jan 17 10:36:19 1996
---- src/lib/InterViews/style.c	Wed Jan 17 11:23:13 1996
+--- src/lib/InterViews/style.c	Mon Jan  3 13:49:46 2000
 ***************
 *** 41,47 ****
 --- 41,51 ----
@@ -14,3 +14,20 @@
   #endif /* JIV */
   
   declarePtrList(StyleList,Style)
+***************
+*** 427,433 ****
+  	for (long i = 0; i < e->avail_; i++) {
+  	    new_list[i] = e->entries_[i];
+  	}
+! 	for (i = e->avail_; i < new_avail; i++) {
+  	    new_list[i] = nil;
+  	}
+  	delete e->entries_;
+--- 431,437 ----
+  	for (long i = 0; i < e->avail_; i++) {
+  	    new_list[i] = e->entries_[i];
+  	}
+! 	for (int i = e->avail_; i < new_avail; i++) {
+  	    new_list[i] = nil;
+  	}
+  	delete e->entries_;
diff --git a/japanese/iv/files/patch-bd b/japanese/iv/files/patch-bd
index 526b30db6b8d..4fa3bd702726 100644
--- a/japanese/iv/files/patch-bd
+++ b/japanese/iv/files/patch-bd
@@ -1,5 +1,5 @@
---- src/lib/Unidraw/catalog.c.orig	Thu May 27 20:04:40 1999
-+++ src/lib/Unidraw/catalog.c	Thu May 27 20:06:39 1999
+--- src/lib/Unidraw/catalog.c.orig	Sat Dec 12 13:27:55 1992
++++ src/lib/Unidraw/catalog.c	Mon Jan  3 15:13:19 2000
 @@ -57,7 +57,9 @@
  #include <IV-2_6/_enter.h>
  
@@ -10,3 +10,33 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
+@@ -65,6 +67,8 @@
+ #include <strstream.h>
+ #ifdef SYSV
+ #include <OS/types.h>
++#endif
++#if defined(SYSV) || __FreeBSD_cc_version >= 400003 
+ #include <unistd.h>
+ #endif
+ #include <sys/file.h>
+@@ -1502,7 +1506,8 @@
+             in >> graylevel;
+ 
+         } else if (graylevel == nograylevel) {
+-            for (int i = 0; in >> buf && i < patternHeight; i++) {
++	    int i;
++            for (i = 0; in >> buf && i < patternHeight; i++) {
+                 if (buf[0] == '>' || sscanf(buf, "%x", &data[i]) != 1) {
+                     break;
+                 }
+@@ -1610,8 +1615,9 @@
+ 	} else {
+ 	    istrstream in(definition, strlen(definition) + 1);
+             int data[patternHeight];
++	    int i;
+ 
+-	    for (int i = 0; in >> buf && i < patternHeight; i++) {
++	    for (i = 0; in >> buf && i < patternHeight; i++) {
+ 		if (sscanf(buf, "%x", &data[i]) != 1) {
+ 		    break;
+ 		}
diff --git a/japanese/iv/files/patch-bg b/japanese/iv/files/patch-bg
index b3cb80357b51..e0c06e36f053 100644
--- a/japanese/iv/files/patch-bg
+++ b/japanese/iv/files/patch-bg
@@ -1,12 +1,55 @@
---- src/bin/ibuild/ibcode.c.orig	Thu May 27 21:37:28 1999
-+++ src/bin/ibuild/ibcode.c	Thu May 27 21:38:01 1999
-@@ -41,7 +41,9 @@
+--- src/bin/ibuild/ibcode.c.orig	Tue Oct 20 02:58:01 1992
++++ src/bin/ibuild/ibcode.c	Wed Jan  5 22:35:36 2000
+@@ -41,7 +41,12 @@
  #include <Unidraw/Graphic/pspaint.h>
  #include <InterViews/shape.h>
  #include <InterViews/transformer.h>
 +#if __FreeBSD_cc_version < 400002
  #include <osfcn.h>
 +#endif
++#if __FreeBSD_cc_version >= 400003
++#include <stdio.h>
++#endif
  #include <stdlib.h>
  #include <stream.h>
  #include <string.h>
+@@ -362,7 +367,7 @@
+ 	ButtonStateVar* bsVar = intcomp->GetButtonStateVar();
+ 	const char* bsname = bsVar->GetName();
+ 	const char* proc = bsVar->GetFuncName();
+-        boolean export = bsVar->GetExport();
++        boolean getexport = bsVar->GetExport();
+         const char* subclass = bsVar->GetSubclassName();
+ 
+         if (!bsVar->IsSubclass() && !_emitMain) {
+@@ -375,7 +380,7 @@
+ 	if (!_bsinitslist->Search(bsname)) {
+ 	    _bsinitslist->Append(bsname);
+ 
+-            if (export && !_emitMain) {
++            if (getexport && !_emitMain) {
+                 out << "    " << bsname;
+             } else {
+                 out << "    " << ButtonClass << "* " << bsname;
+@@ -384,7 +389,7 @@
+             out << bsVar->GetInitial() << ");\n";
+ 
+             if (!_emitMain && proc != nil && *proc != '\0') {
+-                if (!export || bsVar->IsSubclass()) {
++                if (!getexport || bsVar->IsSubclass()) {
+                     out << "    " << bsname << "->SetCoreClass(this);\n";
+                     out <<"    "<< bsname<<"->SetCoreFunc("<< "&" << coreclass;
+                     out << "::" << proc << ");\n";
+@@ -1598,10 +1603,10 @@
+ void CodeView::BeginInstantiate (ostream& out) {
+     InteractorComp* icomp = GetIntComp();
+     const char* mname = icomp->GetMemberNameVar()->GetName();
+-    boolean export = icomp->GetMemberNameVar()->GetExport();
++    boolean getexport = icomp->GetMemberNameVar()->GetExport();
+     const char* classname = icomp->GetClassNameVar()->GetName();
+ 
+-    if (export && !_emitMain) {
++    if (getexport && !_emitMain) {
+         out << "    " << mname << " = new ";
+     } else {
+         out << "    " << classname << "* ";
diff --git a/japanese/iv/files/patch-bi b/japanese/iv/files/patch-bi
index 1d957ffda908..aa1d3d448a98 100644
--- a/japanese/iv/files/patch-bi
+++ b/japanese/iv/files/patch-bi
@@ -1,6 +1,6 @@
---- src/bin/iclass/direct.c.orig	Thu May 27 21:46:51 1999
-+++ src/bin/iclass/direct.c	Thu May 27 21:47:19 1999
-@@ -30,7 +30,9 @@
+--- src/bin/iclass/direct.c.orig	Sat Dec 12 13:40:42 1992
++++ src/bin/iclass/direct.c	Mon Jan  3 15:24:22 2000
+@@ -30,11 +30,17 @@
  #include <OS/string.h>
  #include <OS/types.h>
  #include <stddef.h>
@@ -10,3 +10,11 @@
  #include <pwd.h>
  #include <string.h>
  #include <stdlib.h>
+ #include <sys/stat.h>
++
++#if __FreeBSD_cc_version >= 400003
++#include <unistd.h>
++#endif
+ 
+ #ifdef __DECCXX
+ extern "C" {
diff --git a/japanese/iv/files/patch-bj b/japanese/iv/files/patch-bj
new file mode 100644
index 000000000000..d814aed0a6fa
--- /dev/null
+++ b/japanese/iv/files/patch-bj
@@ -0,0 +1,11 @@
+--- src/bin/dclock/data.c.org	Sat Jul 20 04:13:49 1991
++++ src/bin/dclock/data.c	Mon Jan  3 14:07:07 2000
+@@ -156,7 +156,7 @@
+ 	ColonData[1].x[i] = Colon.x[i]+COLx+ColonData[1].y[i]*Slant/width;
+     }
+ 
+-    for ( i=0; i<12; i++ ) {			// shift, scale, slant A, P, M
++    for ( int i=0; i<12; i++ ) {			// shift, scale, slant A, P, M
+ 	AData.y[i] = (AData.y[i]+0.7)/height + ALLy;
+ 	AData.x[i] = (AData.x[i])/width+HTx+AData.y[i]*Slant/width-0.15/width;
+ 	PData.y[i] = (PData.y[i]+0.7)/height + ALLy;
diff --git a/japanese/iv/files/patch-bk b/japanese/iv/files/patch-bk
new file mode 100644
index 000000000000..c49b76f2d315
--- /dev/null
+++ b/japanese/iv/files/patch-bk
@@ -0,0 +1,72 @@
+--- src/bin/doc/Document.c.org	Sat Dec 12 08:36:37 1992
++++ src/bin/doc/Document.c	Mon Jan  3 14:10:55 2000
+@@ -450,7 +450,8 @@
+         return nil;
+     } else {
+         long count = _families->count();
+-        for (long i = 0; i < count; ++i) {
++	long i;
++        for (i = 0; i < count; ++i) {
+             FontFamilyInfo& info = _families->item_ref(0);
+             if (strcmp(info._name, name) == 0) {
+                 break;
+@@ -590,7 +591,8 @@
+ void Document::remove_float (Item* item) {
+     touch(true);
+     long count = _viewer->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         DocumentViewerInfo& info = _viewer->item_ref(i);
+         info._viewer->float_removed(item);
+     }
+@@ -2277,7 +2279,8 @@
+ 
+ long Document::find_macro (const char* name) {
+     long count = _macro->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         MacroInfo& info = _macro->item_ref(i);
+         if (strcmp(info._name, name) == 0) {
+             break;
+@@ -2314,7 +2317,8 @@
+ 
+ long Document::find_counter (const char* name) {
+     long count = _counter->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         CounterInfo& info = _counter->item_ref(i);
+         if (strcmp(info._name, name) == 0) {
+             break;
+@@ -2365,7 +2369,8 @@
+ 
+ long Document::find_parameter (const char* name) {
+     long count = _parameter->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         DocumentParameterInfo& info = _parameter->item_ref(i);
+         if (strcmp(info._name, name) == 0) {
+             break;
+@@ -2406,7 +2411,8 @@
+ 
+ long Document::find_label (const char* name) {
+     long count = _label->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         LabelInfo& info = _label->item_ref(i);
+         if (strcmp(info._name, name) == 0) {
+             break;
+@@ -2447,7 +2453,8 @@
+ 
+ long Document::find_float (Item* item) {
+     long count = _float->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         FloatInfo& info = _float->item_ref(i);
+         if (info._item == item) {
+             break;
diff --git a/japanese/iv/files/patch-bl b/japanese/iv/files/patch-bl
new file mode 100644
index 000000000000..7eca01d9d162
--- /dev/null
+++ b/japanese/iv/files/patch-bl
@@ -0,0 +1,11 @@
+--- src/lib/IV-2_6/control.c.org	Wed Feb 12 05:48:58 1992
++++ src/lib/IV-2_6/control.c	Mon Jan  3 14:18:03 2000
+@@ -162,7 +162,7 @@
+ 	    return true;
+ 	}
+     }
+-    for (c = state_->Prev(); c != nil; c = c->Prev()) {
++    for (ControlState* c = state_->Prev(); c != nil; c = c->Prev()) {
+ 	if (c->IsView(i)) {
+ 	    return true;
+ 	}
diff --git a/japanese/iv/files/patch-bm b/japanese/iv/files/patch-bm
new file mode 100644
index 000000000000..8caaca5e8d61
--- /dev/null
+++ b/japanese/iv/files/patch-bm
@@ -0,0 +1,11 @@
+--- src/bin/dclock/segment.c.org	Tue Mar  5 02:56:58 1991
++++ src/bin/dclock/segment.c	Mon Jan  3 14:19:39 2000
+@@ -51,7 +51,7 @@
+ 	Row[i] |= Row[i]<<16;
+ 	seed >>= 4;
+     }
+-    for (i = 0; i < 16; i++) {
++    for (int i = 0; i < 16; i++) {
+ 	dat[i] = Row[i%4];
+     }
+     pat = new Pattern(dat);
diff --git a/japanese/iv/files/patch-bn b/japanese/iv/files/patch-bn
new file mode 100644
index 000000000000..8aba3cd8813f
--- /dev/null
+++ b/japanese/iv/files/patch-bn
@@ -0,0 +1,82 @@
+--- src/bin/doc/DocViewer.c.org	Thu Nov 26 13:46:57 1992
++++ src/bin/doc/DocViewer.c	Mon Jan  3 14:23:14 2000
+@@ -601,7 +601,8 @@
+ 
+ void DocumentViewer::pin (const char* name) {
+     long count = _pinned_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ViewerPinnedInfo& m = _pinned_info->item_ref(i);
+         if (strcmp(m._name, name) == 0) {
+             break;
+@@ -634,7 +635,8 @@
+ 
+ void DocumentViewer::unpin (const char* name) {
+     long count = _pinned_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ViewerPinnedInfo& m = _pinned_info->item_ref(i);
+         if (strcmp(m._name, name) == 0) {
+             break;
+@@ -652,7 +654,8 @@
+ void DocumentViewer::menubar (const char* name) {
+     choose(nil, false);
+     long count = _menu_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ViewerMenuInfo& m = _menu_info->item_ref(i);
+         if (strcmp(m._name, name) == 0) {
+             break;
+@@ -675,7 +678,8 @@
+ 
+ void DocumentViewer::keymap (const char* name) {
+     long count = _keymap_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ViewerKeymapInfo& info = _keymap_info->item_ref(i);
+         if (strcmp(info._name, name) == 0) {
+             break;
+@@ -699,7 +703,8 @@
+     const char* name, const Color*& overlay, const Color*& underlay
+ ) {
+     long count = _color_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ViewerColorInfo& info = _color_info->item_ref(i);
+         if (strcmp(info._name, name) == 0) {
+             break;
+@@ -767,7 +772,8 @@
+ 
+ void DocumentViewer::float_removed (Item* item) {
+     long count = _float_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         if (_float_info->item_ref(i)._item == item) {
+             break;
+         }
+@@ -783,7 +789,8 @@
+ 
+ void DocumentViewer::float_changed (Item* item) {
+     long count = _float_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         if (_float_info->item_ref(i)._item == item) {
+             break;
+         }
+@@ -798,7 +805,8 @@
+ void DocumentViewer::float_adjusted (Item* item, float x, float y, long p) {
+     Session::instance()->default_display()->flush();
+     long count = _float_info->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         if (_float_info->item_ref(i)._item == item) {
+             break;
+         }
diff --git a/japanese/iv/files/patch-bo b/japanese/iv/files/patch-bo
new file mode 100644
index 000000000000..f9641e4dd41e
--- /dev/null
+++ b/japanese/iv/files/patch-bo
@@ -0,0 +1,38 @@
+--- src/bin/idraw/idarrow.c.org	Tue Jul 14 02:46:07 1992
++++ src/bin/idraw/idarrow.c	Mon Jan  3 14:25:47 2000
+@@ -304,9 +304,10 @@
+ 	if (dashpatsize <= 0) {
+ 	    out << "[] " << dashoffset << " ";
+ 	} else {
++	    int i;
+ 	    out << "[";
+ 
+-	    for (int i = 0; i < dashpatsize - 1; i++) {
++	    for (i = 0; i < dashpatsize - 1; i++) {
+ 		out << dashpat[i] << " ";
+ 	    }
+ 	    out << dashpat[i] << "] " << dashoffset << " ";
+@@ -557,9 +558,10 @@
+ 	if (dashpatsize <= 0) {
+ 	    out << "[] " << dashoffset << " ";
+ 	} else {
++	    int i;
+ 	    out << "[";
+ 
+-	    for (int i = 0; i < dashpatsize - 1; i++) {
++	    for (i = 0; i < dashpatsize - 1; i++) {
+ 		out << dashpat[i] << " ";
+ 	    }
+ 	    out << dashpat[i] << "] " << dashoffset << " ";
+@@ -806,9 +808,10 @@
+ 	if (dashpatsize <= 0) {
+ 	    out << "[] " << dashoffset << " ";
+ 	} else {
++	    int i;
+ 	    out << "[";
+ 
+-	    for (int i = 0; i < dashpatsize - 1; i++) {
++	    for (i = 0; i < dashpatsize - 1; i++) {
+ 		out << dashpat[i] << " ";
+ 	    }
+ 	    out << dashpat[i] << "] " << dashoffset << " ";
diff --git a/japanese/iv/files/patch-bp b/japanese/iv/files/patch-bp
new file mode 100644
index 000000000000..4d17ca0c980b
--- /dev/null
+++ b/japanese/iv/files/patch-bp
@@ -0,0 +1,12 @@
+--- src/bin/mailbox/main.c.org	Sat Sep 12 01:19:22 1992
++++ src/bin/mailbox/main.c	Mon Jan  3 14:27:04 2000
+@@ -453,7 +453,8 @@
+ 	    if (atp != nil) {
+ 		char* dotp = strchr(atp, '.');
+ 		if (dotp != nil) {
+-		    for (int i = 0; i < strlen(mail_domain); ++i) {
++		    int i;
++		    for (i = 0; i < strlen(mail_domain); ++i) {
+ 			char c = dotp[i];
+ 			c = isupper(c) ? c - 'A' + 'a' : c;
+ 			if (c != mail_domain[i]) {
diff --git a/japanese/iv/files/patch-bq b/japanese/iv/files/patch-bq
new file mode 100644
index 000000000000..fe497312f8fe
--- /dev/null
+++ b/japanese/iv/files/patch-bq
@@ -0,0 +1,12 @@
+--- src/lib/IV-2_6/matcheditor.c.org	Thu Jun 25 03:30:20 1992
++++ src/lib/IV-2_6/matcheditor.c	Mon Jan  3 14:32:28 2000
+@@ -53,7 +53,8 @@
+ }
+ 
+ void MatchEditor::Match (const char* p, boolean m) {
+-    for (char* pp = pattern; *p != '\0'; ++p, ++pp) {
++    char* pp;
++    for (pp = pattern; *p != '\0'; ++p, ++pp) {
+         *pp = *p;
+         if (*p == '%') {
+             ++p;
diff --git a/japanese/iv/files/patch-br b/japanese/iv/files/patch-br
new file mode 100644
index 000000000000..5fdc8bbe2351
--- /dev/null
+++ b/japanese/iv/files/patch-br
@@ -0,0 +1,42 @@
+--- src/bin/doc/DialogMgr.c.org	Sat Apr 11 14:28:48 1992
++++ src/bin/doc/DialogMgr.c	Mon Jan  3 14:34:49 2000
+@@ -108,7 +108,8 @@
+     Window* window, const char* prompt, const char* filter
+ ) {
+     long count = _chooser->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ChooserInfo& info = _chooser->item_ref(i);
+         if (strcmp(info._prompt, prompt) == 0) {
+             break;
+@@ -128,7 +129,8 @@
+     Window* window, const char* prompt, const char* initial
+ ) {
+     long count = _asker->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         AskerInfo& info = _asker->item_ref(i);
+         if (strcmp(info._prompt, prompt) == 0) {
+             break;
+@@ -146,7 +148,8 @@
+ 
+ int DialogManager::confirm (Window* window, const char* prompt) {
+     long count = _confirmer->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ConfirmerInfo& info = _confirmer->item_ref(i);
+         if (strcmp(info._prompt, prompt) == 0) {
+             break;
+@@ -164,7 +167,8 @@
+ 
+ void DialogManager::report (Window* window, const char* prompt) {
+     long count = _reporter->count();
+-    for (long i = 0; i < count; ++i) {
++    long i;
++    for (i = 0; i < count; ++i) {
+         ReporterInfo& info = _reporter->item_ref(i);
+         if (strcmp(info._prompt, prompt) == 0) {
+             break;
diff --git a/japanese/iv/files/patch-bs b/japanese/iv/files/patch-bs
new file mode 100644
index 000000000000..ae71df5d2d66
--- /dev/null
+++ b/japanese/iv/files/patch-bs
@@ -0,0 +1,12 @@
+--- src/bin/idraw/idcatalog.c.org	Mon Jan  3 14:37:37 2000
++++ src/bin/idraw/idcatalog.c	Mon Jan  3 14:36:51 2000
+@@ -662,7 +662,8 @@
+ 		graylevel = CalcGrayLevel(data[0]);
+ 	    }
+ 	} else if (graylevel == -1) {
+-	    for (int i = 0; in >> _buf && i < patternHeight; i++) {
++	    int i;
++	    for (i = 0; in >> _buf && i < patternHeight; i++) {
+ 		if (_buf[0] == '>' || sscanf(_buf, "%x", &data[i]) != 1) {
+ 		    break;
+ 		}
diff --git a/japanese/iv/files/patch-bt b/japanese/iv/files/patch-bt
new file mode 100644
index 000000000000..46ba81a8d8b2
--- /dev/null
+++ b/japanese/iv/files/patch-bt
@@ -0,0 +1,16 @@
+--- src/lib/IV-X11/xdrag.c.org	Sat Nov 14 14:14:37 1992
++++ src/lib/IV-X11/xdrag.c	Mon Jan  3 14:44:07 2000
+@@ -230,11 +230,12 @@
+     XWindow *children;
+     unsigned int kids;
+     Status status;
++    int i;
+     status = XQueryTree(display, root, &root, &parent, &children, &kids);
+     if (status == 0) {
+ 	return None;
+     }
+-    for (int i = kids - 1; i >= 0 && children[i] != under ; --i);
++    for (i = kids - 1; i >= 0 && children[i] != under ; --i);
+     for (--i; i >= 0; --i) {
+ 	XWindowAttributes attributes;
+ 	XGetWindowAttributes(display, children[i], &attributes);
diff --git a/japanese/iv/files/patch-bu b/japanese/iv/files/patch-bu
new file mode 100644
index 000000000000..59c606e1e0da
--- /dev/null
+++ b/japanese/iv/files/patch-bu
@@ -0,0 +1,19 @@
+--- src/bin/doc/Keymap.c.org	Sat Apr 11 14:29:37 1992
++++ src/bin/doc/Keymap.c	Mon Jan  3 14:45:40 2000
+@@ -103,6 +103,7 @@
+         _viewer != nil
+         && e.type() == Event::key && e.mapkey(s, sizeof(s)) > 0
+     ) {
++	long i;
+         _viewer->ref();
+         ItemView* view = _viewer->focus();
+         long count = _info->count();
+@@ -110,7 +111,7 @@
+         if (key < 0) {
+             key += 256;
+         }
+-        for (long i = 0; i < count; ++i) {
++        for (i = 0; i < count; ++i) {
+             DocKeymapInfo& info = _info->item_ref(i);
+             if (info._key == key) {
+                 boolean pending_repair;
diff --git a/japanese/iv/files/patch-bv b/japanese/iv/files/patch-bv
new file mode 100644
index 000000000000..5c3c40814c6e
--- /dev/null
+++ b/japanese/iv/files/patch-bv
@@ -0,0 +1,14 @@
+--- src/lib/Unidraw/psview.c.org	Mon Jan  3 14:40:35 2000
++++ src/lib/Unidraw/psview.c	Mon Jan  3 15:15:12 2000
+@@ -992,9 +992,10 @@
+ 	if (dashpatsize <= 0) {
+ 	    out << "[] " << dashoffset << " ";
+ 	} else {
++	    int i;
+ 	    out << "[";
+ 
+-	    for (int i = 0; i < dashpatsize - 1; i++) {
++	    for (i = 0; i < dashpatsize - 1; i++) {
+ 		out << dashpat[i] << " ";
+ 	    }
+ 	    out << dashpat[i] << "] " << dashoffset << " ";
diff --git a/japanese/iv/files/patch-bw b/japanese/iv/files/patch-bw
new file mode 100644
index 000000000000..bba143cf5469
--- /dev/null
+++ b/japanese/iv/files/patch-bw
@@ -0,0 +1,12 @@
+--- src/lib/IV-X11/xfont.c.org	Mon Jan  3 15:17:24 2000
++++ src/lib/IV-X11/xfont.c	Mon Jan  3 15:21:01 2000
+@@ -706,7 +706,8 @@
+     int sublength = strlen(substring);
+     int length = strlen(string) - sublength;
+     for (int i = 0; i <= length; ++i) {
+-        for (int j = 0; j < sublength; ++j) {
++	int j;
++        for (j = 0; j < sublength; ++j) {
+             if (string[i+j] != substring[j]) {
+                 break;
+             }
diff --git a/japanese/iv/files/patch-bx b/japanese/iv/files/patch-bx
new file mode 100644
index 000000000000..d5dbd2772ec4
--- /dev/null
+++ b/japanese/iv/files/patch-bx
@@ -0,0 +1,11 @@
+--- src/lib/Unidraw/stencilcomp.c.org	Wed Mar 25 10:18:16 1992
++++ src/lib/Unidraw/stencilcomp.c	Mon Jan  3 15:30:38 2000
+@@ -169,7 +169,7 @@
+     StencilComp* comp = (StencilComp*) GetSubject();
+     Bitmap* image, *mask;
+     comp->GetStencil()->GetOriginal(image, mask);
+-    char* tag = (image == mask) ? "SSten" : "FSten";
++    const char* tag = (image == mask) ? "SSten" : "FSten";
+     Coord w = image->Width();
+     Coord h = image->Height();
+ 
diff --git a/japanese/iv/files/patch-by b/japanese/iv/files/patch-by
new file mode 100644
index 000000000000..400553ae50de
--- /dev/null
+++ b/japanese/iv/files/patch-by
@@ -0,0 +1,14 @@
+--- src/lib/Unidraw/text.c.org	Wed Mar 25 10:18:22 1992
++++ src/lib/Unidraw/text.c	Mon Jan  3 15:32:12 2000
+@@ -560,9 +560,10 @@
+ // errors in a Postscript string.
+ 
+ const char* PSText::Filter (const char* string, int len) {
++    int dot;
+     TextBuffer stext(sbuf, 0, SBUFSIZE);
+ 
+-    for (int dot = 0; len--; string++) {
++    for (dot = 0; len--; string++) {
+ 	char c = *string;
+ 
+ 	if (!isascii(c) || iscntrl(c)) {
diff --git a/japanese/iv/files/patch-bz b/japanese/iv/files/patch-bz
new file mode 100644
index 000000000000..7df7c2a9e5ec
--- /dev/null
+++ b/japanese/iv/files/patch-bz
@@ -0,0 +1,11 @@
+--- src/bin/idraw/ided.c.org	Mon Jan  3 15:33:16 2000
++++ src/bin/idraw/ided.c	Mon Jan  3 15:36:25 2000
+@@ -362,7 +362,7 @@
+     return commands;
+ }
+ 
+-static const unit = 15;
++static const int unit = 15;
+ 
+ static Coord xClosed[] = { unit/5, unit, unit, unit*3/5, 0 };
+ static Coord yClosed[] = { 0, unit/5, unit*3/5, unit, unit*2/5 };
diff --git a/japanese/iv/files/patch-ca b/japanese/iv/files/patch-ca
new file mode 100644
index 000000000000..a47188bc943b
--- /dev/null
+++ b/japanese/iv/files/patch-ca
@@ -0,0 +1,20 @@
+--- src/bin/ibuild/ibvars.h.org	Thu Jul 16 07:36:21 1992
++++ src/bin/ibuild/ibvars.h	Wed Jan  5 22:08:03 2000
+@@ -232,7 +232,7 @@
+ 
+ inline boolean MemberSharedName::GetExport() { return _export; }
+ inline SubclassNameVar* MemberSharedName::GetSubclass () { return _subclass; }
+-inline void MemberSharedName::SetExport(boolean export) { _export = export;}
++inline void MemberSharedName::SetExport(boolean m_export) { _export = m_export;}
+ inline int& MemberSharedName::GetSerial () { return _mSerial; }
+ inline IDVar* MemberSharedName::GetIDVar () { return _idVar; }
+ 
+@@ -326,7 +326,7 @@
+ inline int ButtonSharedName::GetInitial() { return _initial; }
+ inline void ButtonSharedName::SetInitial(int initial) { _initial = initial;}
+ inline boolean ButtonSharedName::GetExport() { return _export; }
+-inline void ButtonSharedName::SetExport(boolean export) { _export = export;}
++inline void ButtonSharedName::SetExport(boolean m_export) { _export = m_export;}
+ inline const char* ButtonSharedName::GetFuncName() { return _func; }
+ inline int& ButtonSharedName::GetSerial() { return _bsSerial; }
+ inline SubclassNameVar* ButtonSharedName::GetSubclass () { return _subclass; }
diff --git a/japanese/iv/files/patch-cb b/japanese/iv/files/patch-cb
new file mode 100644
index 000000000000..a46436b41e4e
--- /dev/null
+++ b/japanese/iv/files/patch-cb
@@ -0,0 +1,12 @@
+--- src/bin/ibuild/ibcatalog.c.org	Wed Sep  9 07:36:27 1992
++++ src/bin/ibuild/ibcatalog.c	Wed Jan  5 22:12:40 2000
+@@ -614,7 +614,8 @@
+ 		graylevel = CalcGrayLevel(data[0]);
+ 	    }
+ 	} else if (graylevel == -1) {
+-	    for (int i = 0; in >> _buf && i < patternHeight; i++) {
++	    int i;
++	    for (i = 0; in >> _buf && i < patternHeight; i++) {
+ 		if (_buf[0] == '>' || sscanf(_buf, "%x", &data[i]) != 1) {
+ 		    break;
+ 		}
diff --git a/japanese/iv/files/patch-cc b/japanese/iv/files/patch-cc
new file mode 100644
index 000000000000..d1b8204633fe
--- /dev/null
+++ b/japanese/iv/files/patch-cc
@@ -0,0 +1,30 @@
+--- src/bin/ibuild/ibdialog.c.org	Wed Oct 28 10:19:27 1992
++++ src/bin/ibuild/ibdialog.c	Wed Jan  5 22:39:32 2000
+@@ -35,6 +35,9 @@
+ #include <Unidraw/unidraw.h>
+ #include <Unidraw/viewer.h>
+ #include <Unidraw/catalog.h>
++#if __FreeBSD_cc_version >= 400003
++#include <stdio.h>
++#endif
+ #include <stream.h>
+ #include <string.h>
+ 
+@@ -380,7 +383,7 @@
+     strcat(ButtonClass, "_Button");
+     const char* proc = bsVar->GetFuncName();
+     
+-    boolean export = bsVar->GetExport();
++    boolean getexport = bsVar->GetExport();
+     CodeView* kidview = GetKidView();
+     MemberNameVar* kidname;
+     if (kidview != nil) {
+@@ -407,7 +410,7 @@
+ 
+     out << "Interactor*" << coreclass;
+     out << "::Interior() {\n";
+-    if (export) {
++    if (getexport) {
+         out << "    " << bsVar->GetName() << " = state;\n";
+     } else {
+         out << "    ButtonState* ";
diff --git a/japanese/iv/files/patch-cd b/japanese/iv/files/patch-cd
new file mode 100644
index 000000000000..0fc7e791112b
--- /dev/null
+++ b/japanese/iv/files/patch-cd
@@ -0,0 +1,11 @@
+--- src/bin/ibuild/ibed.c.org	Wed Nov 11 03:16:15 1992
++++ src/bin/ibuild/ibed.c	Wed Jan  5 22:42:25 2000
+@@ -672,7 +672,7 @@
+     return tools;
+ }
+ 
+-static const unit = 15;
++static const int unit = 15;
+ 
+ static Coord xClosed[] = { unit/5, unit, unit, unit*3/5, 0 };
+ static Coord yClosed[] = { 0, unit/5, unit*3/5, unit, unit*2/5 };
diff --git a/japanese/iv/files/patch-ce b/japanese/iv/files/patch-ce
new file mode 100644
index 000000000000..63711575caba
--- /dev/null
+++ b/japanese/iv/files/patch-ce
@@ -0,0 +1,19 @@
+--- src/bin/ibuild/ibglue.c.org	Sat Apr 25 05:14:55 1992
++++ src/bin/ibuild/ibglue.c	Wed Jan  5 22:44:05 2000
+@@ -271,14 +271,14 @@
+             strcpy(VGlueClass, coreclass);
+             strcat(VGlueClass, "_VGlue");
+             
+-            boolean export = icomp->GetMemberNameVar()->GetExport();
++            boolean getexport = icomp->GetMemberNameVar()->GetExport();
+             const char* classname = icomp->GetClassNameVar()->GetName();
+             if (icomp->GetClassNameVar()->IsSubclass()) {
+                 BeginInstantiate(out);
+                 out << "(";
+ 
+             } else {
+-                if (export && !_emitMain) {
++                if (getexport && !_emitMain) {
+                     out << "    " << mname << " = new ";
+                 } else {
+                     out << "    " << classname << "* ";
diff --git a/japanese/iv/files/patch-cf b/japanese/iv/files/patch-cf
new file mode 100644
index 000000000000..97972e5fa605
--- /dev/null
+++ b/japanese/iv/files/patch-cf
@@ -0,0 +1,29 @@
+--- src/bin/ibuild/ibmenu.c.org	Wed Sep  9 07:34:15 1992
++++ src/bin/ibuild/ibmenu.c	Wed Jan  5 22:45:28 2000
+@@ -403,7 +403,7 @@
+             
+             const char* proc = menuItem->GetTrackNameVar()->GetName();
+             const char* text = menuItem->GetMenuItemGraphic()->GetText();
+-            boolean export = icomp->GetMemberNameVar()->GetExport();
++            boolean getexport = icomp->GetMemberNameVar()->GetExport();
+             Shape* shape = icomp->GetShapeVar()->GetShape();
+             
+             if (icomp->GetClassNameVar()->IsSubclass()) {
+@@ -411,7 +411,7 @@
+                 out << "(";
+                 
+             } else {
+-                if (export && !_emitMain) {
++                if (getexport && !_emitMain) {
+                     out << "    " << mname << " = ";
+                     out << "new " << MenuClass;
+                 } else {
+@@ -431,7 +431,7 @@
+             EndInstantiate(out);
+             
+             if (!_emitMain && proc != nil && *proc != '\0') {
+-                if (!export || icomp->GetClassNameVar()->IsSubclass()) {
++                if (!getexport || icomp->GetClassNameVar()->IsSubclass()) {
+                     out << "    " << mname << "->SetCoreClass(this);\n";
+                     out <<"    "<< mname <<"->SetCoreFunc("<< "&" << coreclass;
+                     out << "::" << proc << ");\n";
diff --git a/japanese/iv/files/patch-cg b/japanese/iv/files/patch-cg
new file mode 100644
index 000000000000..c110775fe8fd
--- /dev/null
+++ b/japanese/iv/files/patch-cg
@@ -0,0 +1,18 @@
+--- src/bin/ibuild/ibpanelctrl.c.org	Wed Nov 11 03:16:39 1992
++++ src/bin/ibuild/ibpanelctrl.c	Wed Jan  5 22:46:29 2000
+@@ -871,13 +871,13 @@
+     } else if (_emitBSInits) {
+         ButtonStateVar* bsVar = pcComp->GetButtonStateVar();
+ 	const char* name = bsVar->GetName();
+-        boolean export = bsVar->GetExport();
++        boolean getexport = bsVar->GetExport();
+         const char* subclass = bsVar->GetSubclassName();
+ 
+ 	if (!_bsinitslist->Search(name)) {
+ 	    _bsinitslist->Append(name);
+ 
+-            if (export && !_emitMain) {
++            if (getexport && !_emitMain) {
+                 out << "    " << name;
+ 
+             } else {
diff --git a/japanese/iv/files/patch-ch b/japanese/iv/files/patch-ch
new file mode 100644
index 000000000000..891f7b89aeb6
--- /dev/null
+++ b/japanese/iv/files/patch-ch
@@ -0,0 +1,20 @@
+--- src/bin/ibuild/ibslider.c.org	Tue Jun  9 04:44:50 1992
++++ src/bin/ibuild/ibslider.c	Wed Jan  5 22:47:49 2000
+@@ -416,7 +416,7 @@
+                 strcpy(SliderClass, coreclass);
+                 strcat(SliderClass, "_Slider");
+                 
+-                boolean export = icomp->GetMemberNameVar()->GetExport();
++                boolean getexport = icomp->GetMemberNameVar()->GetExport();
+                 const char* classname = icomp->GetClassNameVar()->GetName();
+ 
+ 		int w = icomp->GetCanvasVar()->Width();
+@@ -426,7 +426,7 @@
+                     BeginInstantiate(out);
+                     out << "(";
+                 } else {
+-                    if (export && !_emitMain) {
++                    if (getexport && !_emitMain) {
+                         out << "    " << mname << " = new " << SliderClass;
+                         out << "(";
+                     } else {
diff --git a/japanese/iv/files/patch-ci b/japanese/iv/files/patch-ci
new file mode 100644
index 000000000000..8fff0d34f83a
--- /dev/null
+++ b/japanese/iv/files/patch-ci
@@ -0,0 +1,28 @@
+--- src/bin/ibuild/ibvars.c.org	Wed Sep  9 07:33:42 1992
++++ src/bin/ibuild/ibvars.c	Wed Jan  5 22:49:34 2000
+@@ -371,9 +371,9 @@
+ /*****************************************************************************/
+ 
+ MemberSharedName::MemberSharedName (
+-    const char* name, boolean export, boolean machgen
++    const char* name, boolean b_export, boolean machgen
+ ) : SharedName(name, machgen) {
+-    _export = export;
++    _export = b_export;
+     _subclass = new SubclassNameVar("", false, false);
+     _subclass->ref();
+     _idVar = nil;
+@@ -471,11 +471,11 @@
+ 
+ /*****************************************************************************/
+ MemberNameVar::MemberNameVar (
+-    const char* name, boolean export, boolean machgen
++    const char* name, boolean b_export, boolean machgen
+ ) {
+     _msharedname = nil;
+     if (name != nil) {
+-        _msharedname = new MemberSharedName(name, export, machgen);
++        _msharedname = new MemberSharedName(name, b_export, machgen);
+         _msharedname->ref();
+     }
+ }
diff --git a/japanese/iv/files/patch-cj b/japanese/iv/files/patch-cj
new file mode 100644
index 000000000000..aaf287a80867
--- /dev/null
+++ b/japanese/iv/files/patch-cj
@@ -0,0 +1,11 @@
+--- src/bin/ibuild/ibvarviews.c.org	Sat Apr 25 05:15:01 1992
++++ src/bin/ibuild/ibvarviews.c	Wed Jan  5 22:50:51 2000
+@@ -1399,7 +1399,7 @@
+                 GetConflictCmd sconflict(firewallCmd.GetFirewall(),subclass);
+                 sconflict.Execute();
+                 cl = sconflict.GetConflict();
+-                for(i = cl->First(); i != cl->End(); i = i->Next()) {
++                for(UList* i = cl->First(); i != cl->End(); i = i->Next()) {
+                     StateVar* state = (StateVar*) (*i)();
+                     if (
+                         !state->IsA(INSTANCENAME_VAR) && 
diff --git a/japanese/iv/files/patch-ck b/japanese/iv/files/patch-ck
new file mode 100644
index 000000000000..5137635c8603
--- /dev/null
+++ b/japanese/iv/files/patch-ck
@@ -0,0 +1,31 @@
+diff -Ncr src/bin/idraw/idarrowhead.c src/bin/idraw/idarrowhead.c
+*** src/bin/idraw/idarrowhead.c	Thu Dec 12 08:49:18 1991
+--- src/bin/idraw/idarrowhead.c	Sat Feb  6 19:05:49 1999
+***************
+*** 51,56 ****
+--- 51,75 ----
+  
+  Graphic* Arrowhead::Copy () { return new Arrowhead(_x, _y, this); }
+  Graphic& Arrowhead::operator = (Graphic& g) { return Graphic::operator=(g); }
++ Arrowhead& Arrowhead::operator = (Arrowhead& a) {
++     Graphic::operator=(a);
++ 
++     _count = 0;
++     if (_y)
++ 	delete[] _y;
++     if (_x)
++ 	delete[] _x;
++     _x = _y = nil;
++     if (! a._count)
++ 	return *this;
++ 
++     _count = a._count;
++     _x = new Coord[_count];
++     _y = new Coord[_count];
++     ::memcpy(_x, a._x, sizeof(Coord) * _count);
++     ::memcpy(_y, a._y, sizeof(Coord) * _count);
++     return *this;
++ }
+  
+  Coord Arrowhead::CorrectedHeight (float t) {
+      float w = _x[BOTRIGHT] - _x[BOTCTR];
diff --git a/japanese/iv/files/patch-cl b/japanese/iv/files/patch-cl
new file mode 100644
index 000000000000..91cf254f59bf
--- /dev/null
+++ b/japanese/iv/files/patch-cl
@@ -0,0 +1,13 @@
+diff -Ncr src/bin/idraw/idarrowhead.h src/bin/idraw/idarrowhead.h
+*** src/bin/idraw/idarrowhead.h	Thu Dec 12 08:49:19 1991
+--- src/bin/idraw/idarrowhead.h	Sat Feb  6 19:05:49 1999
+***************
+*** 37,42 ****
+--- 37,43 ----
+  
+      virtual Graphic* Copy();
+      virtual Graphic& operator = (Graphic&);
++     virtual Arrowhead& operator = (Arrowhead&);
+  protected:
+      Arrowhead(Coord*, Coord*, Graphic*);
+  
diff --git a/japanese/iv/files/patch-cm b/japanese/iv/files/patch-cm
new file mode 100644
index 000000000000..4039a45aaaed
--- /dev/null
+++ b/japanese/iv/files/patch-cm
@@ -0,0 +1,117 @@
+diff -Ncr src/bin/idraw/idarrows.c src/bin/idraw/idarrows.c
+*** src/bin/idraw/idarrows.c	Sat Feb  6 19:11:32 1999
+--- src/bin/idraw/idarrows.c	Sat Feb  6 19:05:49 1999
+***************
+*** 295,311 ****
+  }
+  
+  boolean ArrowMultiLine::contains (PointObj& po, Graphic* gs) {
+!     return 
+!         SF_MultiLine::contains(po, gs) || 
+!         Head() && ArrowheadContains(_head, po, gs) ||
+!         Tail() && ArrowheadContains(_tail, po, gs);
+  }
+  
+  boolean ArrowMultiLine::intersects (BoxObj& bo, Graphic* gs) {
+!     return 
+!         SF_MultiLine::intersects(bo, gs) || 
+!         Head() && ArrowheadIntersects(_head, bo, gs) ||
+!         Tail() && ArrowheadIntersects(_tail, bo, gs);
+  }
+  
+  void ArrowMultiLine::draw (Canvas* c, Graphic* gs) {
+--- 295,331 ----
+  }
+  
+  boolean ArrowMultiLine::contains (PointObj& po, Graphic* gs) {
+!     PSPattern *pat;
+!     boolean ret;
+! 
+!     if (Head() || Tail()) {
+! 	pat = gs->GetPattern();
+! 	gs->SetPattern(psnonepat);
+!     }	
+!     ret = (SF_MultiLine::contains(po, gs)
+! 	   || (Head() && ArrowheadContains(_head, po, gs))
+! 	   || (Tail() && ArrowheadContains(_tail, po, gs)));
+!     if (Head() || Tail()) {
+! 	gs->SetPattern(pat);
+!     }
+!     return ret;
+  }
+  
+  boolean ArrowMultiLine::intersects (BoxObj& bo, Graphic* gs) {
+!     PSPattern *pat;
+!     boolean ret;
+! 
+!     if (Head() || Tail()) {
+! 	pat = gs->GetPattern();
+! 	gs->SetPattern(psnonepat);
+!     }	
+!     ret = (SF_MultiLine::intersects(bo, gs)
+! 	   || (Head() && ArrowheadIntersects(_head, bo, gs))
+! 	   || (Tail() && ArrowheadIntersects(_tail, bo, gs)));
+!     if (Head() || Tail()) {
+! 	gs->SetPattern(pat);
+!     }
+!     return ret;
+  }
+  
+  void ArrowMultiLine::draw (Canvas* c, Graphic* gs) {
+***************
+*** 486,502 ****
+  }
+  
+  boolean ArrowOpenBSpline::contains (PointObj& po, Graphic* gs) {
+!     return 
+!         SFH_OpenBSpline::contains(po, gs) || 
+!         Head() && ArrowheadContains(_head, po, gs) ||
+!         Tail() && ArrowheadContains(_tail, po, gs);
+  }
+  
+  boolean ArrowOpenBSpline::intersects (BoxObj& bo, Graphic* gs) {
+!     return 
+!         SFH_OpenBSpline::intersects(bo, gs) || 
+!         Head() && ArrowheadIntersects(_head, bo, gs) ||
+!         Tail() && ArrowheadIntersects(_tail, bo, gs);
+  }
+  
+  void ArrowOpenBSpline::draw (Canvas* c, Graphic* gs) {
+--- 506,542 ----
+  }
+  
+  boolean ArrowOpenBSpline::contains (PointObj& po, Graphic* gs) {
+!     PSPattern *pat;
+!     boolean ret;
+! 
+!     if (Head() || Tail()) {
+! 	pat = gs->GetPattern();
+! 	gs->SetPattern(psnonepat);
+!     }	
+!     ret = (SFH_OpenBSpline::contains(po, gs)
+! 	   || (Head() && ArrowheadContains(_head, po, gs))
+! 	   || (Tail() && ArrowheadContains(_tail, po, gs)));
+!     if (Head() || Tail()) {
+! 	gs->SetPattern(pat);
+!     }
+!     return ret;
+  }
+  
+  boolean ArrowOpenBSpline::intersects (BoxObj& bo, Graphic* gs) {
+!     PSPattern *pat;
+!     boolean ret;
+! 
+!     if (Head() || Tail()) {
+! 	pat = gs->GetPattern();
+! 	gs->SetPattern(psnonepat);
+!     }	
+!     ret = (SFH_OpenBSpline::intersects(bo, gs)
+! 	   || (Head() && ArrowheadIntersects(_head, bo, gs))
+! 	   || (Tail() && ArrowheadIntersects(_tail, bo, gs)));
+!     if (Head() || Tail()) {
+! 	gs->SetPattern(pat);
+!     }
+!     return ret;
+  }
+  
+  void ArrowOpenBSpline::draw (Canvas* c, Graphic* gs) {
diff --git a/japanese/iv/files/patch-cn b/japanese/iv/files/patch-cn
new file mode 100644
index 000000000000..72afe13bf958
--- /dev/null
+++ b/japanese/iv/files/patch-cn
@@ -0,0 +1,63 @@
+diff -Ncr src/lib/IV-X11/xjivfunc.c src/lib/IV-X11/xjivfunc.c
+*** src/lib/IV-X11/xjivfunc.c	Sat Feb  6 19:11:35 1999
+--- src/lib/IV-X11/xjivfunc.c	Sat Feb  6 19:05:50 1999
+***************
+*** 110,115 ****
+--- 110,116 ----
+  	    rb += c.rbearing;
+  	}
+      }
++     delete[] ss;
+      return rb;
+  }
+  
+***************
+*** 175,180 ****
+--- 176,182 ----
+  	    w += c.width;
+  	}
+      }
++     delete[] ss;
+      return w;
+  }
+  
+***************
+*** 248,253 ****
+--- 250,256 ----
+  	    }
+  	}
+      }
++     delete[] ss;
+      return a;
+  }
+  
+***************
+*** 321,326 ****
+--- 324,330 ----
+  	    }
+  	}
+      }
++     delete[] ss;
+      return d;
+  }
+  
+***************
+*** 404,409 ****
+--- 408,414 ----
+  	    XDrawString(dpy, d, gc, x, y, (const char*)ss, sl);
+  	}
+      }
++     delete[] ss;
+  }
+  
+  void JIVDrawImageString(XDisplay *dpy, XDrawable d, GC gc, const Font* f,
+***************
+*** 487,492 ****
+--- 492,498 ----
+  	    XDrawImageString(dpy, d, gc, x, y, (const char*)ss, sl);
+  	}
+      }
++     delete[] ss;
+  }
+  
+  #endif /* JIV */
diff --git a/japanese/iv/pkg-descr b/japanese/iv/pkg-descr
index f3ced26ad5a7..336dd32c8e2e 100644
--- a/japanese/iv/pkg-descr
+++ b/japanese/iv/pkg-descr
@@ -26,6 +26,7 @@
 
 	FURUKAWA <yasu@on.cs.keio.ac.jp>
 	He created fixcmpfont patch from fixeucfont-1.2.
+	And, he fixed critical bug under egcs g++.
 	http://www.on.cs.keio.ac.jp/~yasu/linux/interviews/
 
 Yoshiro MIHIRA