Fix build with base Clang on 11.1 -- this probably does not cover all of the

problems listed in the PR, but it's a step. The port remains unmaintained,
upstream hasn't been maintained in ~8 years, should probably be deprecated instead.

PR:		216197
Approved by:	tcberner (mentor, implicit)
This commit is contained in:
Adriaan de Groot 2018-03-11 21:35:11 +00:00
parent 88ba66367c
commit 7a012043b5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=464212

View file

@ -0,0 +1,25 @@
Fix with modern Clang, e.g.
cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp:215:12: error: ordered comparison between pointer and zero ('CEDSection *' and 'int')
for (;sect>0;sect=sect->next)
--- cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp.orig 2018-03-11 17:08:11 UTC
+++ cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp
@@ -212,7 +212,7 @@ Bool32 CEDPage::FormattedWriteRtf(const
}
*/
// write the text lines
- for (;sect>0;sect=sect->next)
+ for (;sect;sect=sect->next)
{
if (!WriteRtfSection(rtf,sect)) goto WRITE_END; //write section properties
// int sectNum=0;
@@ -897,7 +897,7 @@ Bool WriteRtfCharFmt(struct StrRtfOut fa
// if (curChar->fontNum>=rtf->page->fontsUsed || (prevChar&&prevChar->fontNum>=rtf->page->fontsUsed)) return TRUE;
// extract value for comparison
- if (prevChar>0) {
+ if (prevChar) {
// lstrcpy(PrevTypeFace,TerFont[PrevFont].TypeFace);
PrevFamily=rtf->table[rtf->page->GetFontByNum(prevChar->fontNum)];
PrevStyle=prevChar->fontAttribs;