diff options
| author | Max Horn | 2012-01-28 01:15:49 +0100 |
|---|---|---|
| committer | Max Horn | 2012-02-15 16:51:37 +0100 |
| commit | 658080deeda79d20ea40643569fbcb072573e7cf (patch) | |
| tree | d604bf668909a6db44a1ec83e7c51088a5d85592 /graphics/font.cpp | |
| parent | 37e5b209a71af725456a42be2605dea28ffceb84 (diff) | |
| download | scummvm-rg350-658080deeda79d20ea40643569fbcb072573e7cf.tar.gz scummvm-rg350-658080deeda79d20ea40643569fbcb072573e7cf.tar.bz2 scummvm-rg350-658080deeda79d20ea40643569fbcb072573e7cf.zip | |
ALL: Avoid using is* macros from ctype.h
On some systems, passing signed chars to macros like isspace() etc. lead
to a runtime error. Hence, mark these macros as forbidden by default,
and introduce otherwise equivalent alternatives for them.
Diffstat (limited to 'graphics/font.cpp')
| -rw-r--r-- | graphics/font.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/font.cpp b/graphics/font.cpp index 8775bccc7b..7b48fe9999 100644 --- a/graphics/font.cpp +++ b/graphics/font.cpp @@ -184,7 +184,7 @@ int Font::wordWrapText(const Common::String &str, int maxWidth, Common::Array<Co // 'wrap point' where wrapping could take place. Everything that // came before it can now safely be added to the line, as we know // that it will not have to be wrapped. - if (isspace(c)) { + if (isSpace(c)) { line += tmpStr; lineWidth += tmpWidth; @@ -208,7 +208,7 @@ int Font::wordWrapText(const Common::String &str, int maxWidth, Common::Array<Co if (lineWidth > 0) { wrapper.add(line, lineWidth); // Trim left side - while (tmpStr.size() && isspace(static_cast<unsigned char>(tmpStr[0]))) { + while (tmpStr.size() && isSpace(tmpStr[0])) { tmpStr.deleteChar(0); // This is not very fast, but it is the simplest way to // assure we do not mess something up because of kerning. |