>>>>> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes:
Angus> Jean-Marc Lasgouttes wrote: >> Angus, >> >> I have problems compiling lengthcommon.C with gcc 3.2.2 and need >> the attached patch. Any reason why I should not apply it? Angus> I have never had a problem with a zero byte patch... Umph. JMarc
Index: src/ChangeLog =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v retrieving revision 1.1881 diff -u -p -r1.1881 ChangeLog --- src/ChangeLog 5 Apr 2004 14:05:00 -0000 1.1881 +++ src/ChangeLog 5 Apr 2004 15:27:43 -0000 @@ -1,3 +1,8 @@ +2004-04-05 Jean-Marc Lasgouttes <[EMAIL PROTECTED]> + + * lengthcommon.C: compilation fix: remove explicit array size from + unit_name[] and friends + 2004-04-05 Angus Leeming <[EMAIL PROTECTED]> * lyxlength.[Ch] (unit_name et al.): const-correct. Index: src/lengthcommon.C =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lengthcommon.C,v retrieving revision 1.10 diff -u -p -r1.10 lengthcommon.C --- src/lengthcommon.C 5 Apr 2004 14:05:02 -0000 1.10 +++ src/lengthcommon.C 5 Apr 2004 15:27:43 -0000 @@ -26,14 +26,14 @@ int const num_units = LyXLength::UNIT_NO // unit_name is for compatibility. Can be deleted when all works well. // means, when we have full language support for the lengths // in all gui's (Herbert 2002-11-01) -char const * const unit_name[num_units + 1] = { +char const * const unit_name[] = { "sp", "pt", "bp", "dd", "mm", "pc", "cc", "cm", "in", "ex", "em", "mu", "text%", "col%", "page%", "line%", "theight%", "pheight%", "" }; // the latex units -char const * const unit_name_ltx[num_units + 1] = { +char const * const unit_name_ltx[] = { "sp", "pt", "bp", "dd", "mm", "pc", "cc", "cm", "in", "ex", "em", "mu", // in 1.4 the following names should be used. then no @@ -44,7 +44,7 @@ char const * const unit_name_ltx[num_uni "theight%", "pheight%", "" }; // the LyX gui units -char const * const unit_name_gui[num_units + 1] = { +char const * const unit_name_gui[] = { N_("sp"), N_("pt"), N_("bp"), N_("dd"), N_("mm"), N_("pc"), N_("cc"), N_("cm"), N_("in"), N_("ex"), N_("em"), N_("mu"), N_("text%"), N_("col%"), N_("page%"), N_("line%"),