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 /engines/sky | |
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 'engines/sky')
-rw-r--r-- | engines/sky/control.cpp | 2 | ||||
-rw-r--r-- | engines/sky/detection.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp index a40e77d1cb..6363789d3a 100644 --- a/engines/sky/control.cpp +++ b/engines/sky/control.cpp @@ -974,7 +974,7 @@ void Control::handleKeyPress(Common::KeyState kbd, Common::String &textBuf) { // Allow the key only if is a letter, a digit, or one of a selected // list of extra characters - if (isalnum(kbd.ascii) || strchr(" ,().='-&+!?\"", kbd.ascii) != 0) { + if (isAlnum(kbd.ascii) || strchr(" ,().='-&+!?\"", kbd.ascii) != 0) { textBuf += kbd.ascii; } } diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp index a078200edd..51f7330f09 100644 --- a/engines/sky/detection.cpp +++ b/engines/sky/detection.cpp @@ -206,7 +206,7 @@ SaveStateList SkyMetaEngine::listSaves(const char *target) const { // Extract the extension Common::String ext = file->c_str() + file->size() - 3; ext.toUppercase(); - if (isdigit(static_cast<unsigned char>(ext[0])) && isdigit(static_cast<unsigned char>(ext[1])) && isdigit(static_cast<unsigned char>(ext[2]))){ + if (isDigit(ext[0]) && isDigit(ext[1]) && isDigit(ext[2])) { int slotNum = atoi(ext.c_str()); Common::InSaveFile *in = saveFileMan->openForLoading(*file); if (in) { |