Index: vcl/unx/source/gdi/xfont.cxx =================================================================== RCS file: /cvs/oo/gsl/vcl/unx/source/gdi/xfont.cxx,v retrieving revision 1.12 diff -u -r1.12 xfont.cxx --- vcl/unx/source/gdi/xfont.cxx 2001/04/09 10:55:07 1.12 +++ vcl/unx/source/gdi/xfont.cxx 2001/07/13 19:38:41 @@ -59,6 +59,7 @@ * ************************************************************************/ +#include #include #ifndef EXTENDED_FONTSTRUCT_HXX @@ -382,9 +383,9 @@ int nIdx = nFrom; - for ( ; nIdx < min(nTo, nMinChar); nIdx++, pWidthArray++ ) + for ( ; nIdx < std::min((int)nTo, (int)nMinChar); nIdx++, pWidthArray++ ) *pWidthArray = mnDefaultWidth; - for ( ; nIdx <= min(nTo, nMaxChar); nIdx++, pWidthArray++ ) + for ( ; nIdx <= std::min((int)nTo, (int)nMaxChar); nIdx++, pWidthArray++ ) { XCharStruct* pChar = &(pXFontStruct->per_char[nIdx - nMinChar]); *pWidthArray = CharExists(pChar) ? pChar->width : mnDefaultWidth;