diff -u -d -r -P abi.orig/src/other/spell/good.c abi/src/other/spell/good.c --- abi.orig/src/other/spell/good.c Tue Dec 29 06:55:32 1998 +++ abi/src/other/spell/good.c Tue Feb 8 21:20:28 2000 @@ -130,7 +130,9 @@ void flagpr P ((ichar_t * word, int preflag, int prestrip, int preadd, int sufflag, int sufadd)); +#if 0 /* DELETE_ME */ static ichar_t * orig_word; +#endif /* DELETE_ME */ #ifndef NO_CAPITALIZATION_SUPPORT int good (w, ignoreflagbits, allhits, pfxopts, sfxopts) @@ -153,7 +155,7 @@ ichar_t nword[INPUTWORDLEN + MAXAFFIXLEN]; register ichar_t * p; register ichar_t * q; - register n; + register int n; register struct dent * dp; /* diff -u -d -r -P abi.orig/src/other/spell/newMain.c abi/src/other/spell/newMain.c --- abi.orig/src/other/spell/newMain.c Mon Jan 31 04:19:39 2000 +++ abi/src/other/spell/newMain.c Tue Feb 8 21:16:32 2000 @@ -156,7 +156,7 @@ else { /* convert to 8bit string and null terminate */ - int len_in, len_out; + unsigned int len_in, len_out; const char *In = (const char *)word16; char *Out = word8; @@ -201,7 +201,7 @@ else { /* convert to 8bit string and null terminate */ - int len_in, len_out; + unsigned int len_in, len_out; const char *In = (const char *)word16; char *Out = word8; @@ -250,7 +250,7 @@ else { /* convert to 16bit string and null terminate */ - int len_in, len_out; + unsigned int len_in, len_out; const char *In = possibilities[c]; char *Out = (char *)sg->word[c]; diff -u -d -r -P abi.orig/src/text/ptbl/xp/pf_Frag_TestRoutines.cpp abi/src/text/ptbl/xp/pf_Frag_TestRoutines.cpp --- abi.orig/src/text/ptbl/xp/pf_Frag_TestRoutines.cpp Tue Jun 29 11:29:57 1999 +++ abi/src/text/ptbl/xp/pf_Frag_TestRoutines.cpp Tue Feb 8 21:24:42 2000 @@ -49,19 +49,19 @@ void pf_Frag_Strux_Block::__dump(FILE * fp) const { fprintf(fp," Block %p api[%08lx]\n", - this,m_indexAP); + this,(long)m_indexAP); } void pf_Frag_Strux_Section::__dump(FILE * fp) const { fprintf(fp," Section %p api[%08lx]\n", - this,m_indexAP); + this,(long)m_indexAP); } void pf_Frag_Text::__dump(FILE * fp) const { fprintf(fp," TextFragment %p b[%08lx,%ld] api[%08lx]\n", - this,m_bufIndex,m_length,m_indexAP); + this,(long)m_bufIndex,(long)m_length,(long)m_indexAP); const UT_UCSChar * ptr = m_pPieceTable->getPointer(m_bufIndex); char c; @@ -97,7 +97,7 @@ } fprintf(fp," Object %p t[%s] api[%08lx]\n", - this,sz,m_indexAP); + this,sz,(long)m_indexAP); } #endif /* PT_TEST */